From 143e2f1947d2dd99f1f29350fcaf62afec83e16b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 2 Nov 2020 14:07:49 +0800 Subject: [PATCH 001/329] =?UTF-8?q?=E3=80=9012057=20#20011-----=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E6=B5=81=E7=A8=8B=E6=98=AF=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=92=8Cpo=E6=94=B6=E8=B4=A7=E5=92=8Cpo?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=EF=BC=8C=E6=94=B6=E8=B4=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B5=B0=E5=AE=8C=E4=BD=86=E6=98=AF=E8=BF=98=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E9=9C=80=E8=A6=81=E8=83=BD=E5=A4=9F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=93=8D=E4=BD=9C=E5=90=8E=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E4=B8=8D=E5=85=81=E8=AE=B8=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=BE=85=E6=8F=90=E4=BA=A4=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E3=80=82=E6=9C=9F=E6=9C=9B=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=97=A5=E6=9C=9F2020/10/31=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/bean/WmsMoveSn.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 22d79be..5f0f6bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -412,9 +412,10 @@ public class WmsMoveSn extends BaseBean { } - public WmsMoveSn(String sn, String refSrc, String transTypeName, Integer itemStatus) { + public WmsMoveSn(String sn, String refSrc,String transTypeCode, String transTypeName, Integer itemStatus) { this.sn = sn; this.refSrc = refSrc; + this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; this.itemStatus = itemStatus; } From 47f464b01de12c991b5b3c9573a18bd9a99e4178 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Mon, 2 Nov 2020 14:27:20 +0800 Subject: [PATCH 002/329] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 50 +++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) 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 ad715f0..2a3156a 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 @@ -107,6 +107,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "超时时间(单位:分钟)") private Integer timeOut; + @Transient + @ApiParam(value = "窗口时间") + private Integer windowTime; + + @Transient + @ApiParam(value = "紧急程度") + private String urgentStatus; + @Column(name = "SRC_NO") @ApiParam(value = "源单号") private String srcNo; @@ -123,6 +131,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "完成状态") public Integer orderStatus; + @Transient + @ApiParam(value = "客户名称") + public String custName; + + @Transient + @ApiParam(value = "道口") + public String dock; + /** * 已创建，已收货，已发运，已拣货 */ @@ -134,6 +150,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; + @Transient + @ApiParam(value = "完成数百分比") + private String number; + /** * 是否免费:0=计费,1=免费 */ @@ -285,6 +305,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("生产日期") public String dateCode; + @Transient + @ApiParam("生产线") + public String line; + @ApiParam(value = "散件移库输入移库数量") @Transient public Double inputMoveQty; @@ -420,8 +444,27 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("窗口领料结束时间") private String windowPickEndTime; - public WmsDocMovementDetails () { + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo ,Double qty,Double pickQty, + Double recQty,Double outQty,Integer itemStatus) { + this.custNo = custNo; + this.orderNo = orderNo; + this.planDate = planDate; + this.planTime = planTime; + this.qty = qty; + this.pickQty = pickQty; + this.recQty= recQty; + this.outQty = outQty; + this.itemStatus = itemStatus; + this.projectNo = projectNo; + this.partNo=partNo; + } + public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus) { + this.createDatetime = createDatetime; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.itemStatus= itemStatus; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { @@ -485,6 +528,11 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } + public WmsDocMovementDetails(){ + + } + + public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo,Integer priority,String createDatetime) { this.orderNo = orderNo; this.srcZoneNo = srcZoneNo; From 11748bb19eaa160ca6970dece495856f6c5fdb62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 2 Nov 2020 15:26:34 +0800 Subject: [PATCH 003/329] =?UTF-8?q?=E3=80=9012066=2019048-=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F=E5=8F=98=E6=9B=B4-20201024?= =?UTF-8?q?=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/mes/bean/MesProduceSn.java | 4 ++++ 1 file changed, 4 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 c14092e..a024e83 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 @@ -229,6 +229,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("维修状态") private Integer repairStatus; + @Transient + @ApiParam("颜色名称") + private String colorName; + public MesProduceSn() { } From 52c35877d81e180cd2ee6e3638bc877ef5c70631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 2 Nov 2020 18:02:44 +0800 Subject: [PATCH 004/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/TJMgnBoardModel.java | 12 ++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 8ded48c..b55ccd2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -47,10 +47,22 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("反喷标识") private String reverseSprayMark; + @ApiParam("班次") + private String shiftName; + + @ApiParam("车间配置代码") + private String areaConfigCode; + @ApiParam("列名") private List> headModelList; @ApiParam("列值") private List> headValueModelList; + @ApiParam("不良汇总列名") + private List defectNameList; + + @ApiParam("不良汇总列值") + private List defectValueList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 08e4739..bd6bf3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3501,4 +3501,25 @@ public class MesHqlPack { } return packBean; } + + /** + * MES下线报工查询条件封装 + * + * @param productOffLine + * @return + */ + public static DdlPackBean getIfProductOffLine(IfProductOffLine productOffLine) { + DdlPackBean packBean = getAllBaseDataByNormalPro(productOffLine, productOffLine.getOrganizeCode()); + if (!StringUtils.isEmpty(productOffLine.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getPartNo())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getCreateDateTimeStart()) || !StringUtils.isEmpty(productOffLine.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(productOffLine.getCreateDateTimeStart(), productOffLine.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } } From f38e41f1ec4b7382390c9e962d9d9d11f68636c5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 2 Nov 2020 18:54:18 +0800 Subject: [PATCH 005/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= 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 | 4 +++- 1 file changed, 3 insertions(+), 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 d328625..7188498 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 @@ -5347,7 +5347,9 @@ public class MesEnumUtil { BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"), - BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"); + BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"), + BOARD_MGN_BJ_MAIN_SCREEN("BOARD_MGN_BJ_MAIN_SCREEN", "北京麦格纳总屏幕看板"), + BOARD_MGN_BJ_EQU_REPAIR("BOARD_MGN_BJ_EQU_REPAIR", "北京麦格纳设备维修看板"); private String code; private String description; From fb5df5aedf7e269b009b26da5a9f7fbcec77f98f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 2 Nov 2020 20:48:53 +0800 Subject: [PATCH 006/329] =?UTF-8?q?=E7=85=A7=E7=89=87=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) 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 27b6637..95ed07f 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 @@ -355,7 +355,8 @@ public class MesPcnEnumUtil { UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), - PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"); + PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"), + SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 08e4739..a2de9c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -729,6 +729,24 @@ public class MesHqlPack { } /** + * 产线看板矩阵 + * @param boardLineMatrix + * @param organizeCode + * @return + */ + public static DdlPackBean getBoardLineMatrix(MesBoardLineMatrix boardLineMatrix, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(boardLineMatrix, organizeCode); + if (!StringUtils.isEmpty(boardLineMatrix.getAreaCode())) { + DdlPreparedPack.getStringLikerPack(boardLineMatrix.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(boardLineMatrix.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(boardLineMatrix.getWorkCenterCode(), "workCenterCode", packBean); + } + + return packBean; + } + + /** * MES工步参数信息查询条件封装 * * @param stepParam From a844a4d59b3e1f83041bc9972d1ea2cb05358c46 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 2 Nov 2020 22:07:12 +0800 Subject: [PATCH 007/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 5f0f6bb..d34360f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -359,6 +359,42 @@ public class WmsMoveSn extends BaseBean { this.modifyUser = modifyUser; } + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, + String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, + Integer destSnStatus, String lotNo, String dateCode, String leftCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn, + String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcQty = srcQty; + this.srcQty = srcQty; + this.destQty = destQty; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo = destWhNo; + this.busiTypeCode = busiTypeCode; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) { this.id = id; this.organizeCode = organizeCode; From ab0b8a2af11b48b2a1987bbbabd963a64352857c Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Tue, 3 Nov 2020 14:38:59 +0800 Subject: [PATCH 008/329] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BFsql=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 29 ++++++++++++++++------ 1 file changed, 21 insertions(+), 8 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 2a3156a..a84874b 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 @@ -109,7 +109,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "窗口时间") - private Integer windowTime; + private String windowTime; @Transient @ApiParam(value = "紧急程度") @@ -318,6 +318,14 @@ public class WmsDocMovementDetails extends BaseBean { private Double snp; @Transient + @ApiParam(value = "订单总数量") + private Integer itemCount; + + @Transient + @ApiParam(value = "完成订单数量") + private Integer completeCount; + + @Transient @ApiParam(value = "条码总数量", example = "1") private Double detailsSnCount; @@ -444,27 +452,32 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("窗口领料结束时间") private String windowPickEndTime; - public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo ,Double qty,Double pickQty, - Double recQty,Double outQty,Integer itemStatus) { + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) { this.custNo = custNo; this.orderNo = orderNo; this.planDate = planDate; this.planTime = planTime; - this.qty = qty; - this.pickQty = pickQty; - this.recQty= recQty; - this.outQty = outQty; this.itemStatus = itemStatus; this.projectNo = projectNo; this.partNo=partNo; } + public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + + } - public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus) { + + public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { this.createDatetime = createDatetime; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; this.createUser = createUser; this.itemStatus= itemStatus; + this.orderNo = orderNo; + this.partNo=partNo; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From c0abb5f994f9facd8e206f66f0f421720935de97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 3 Nov 2020 16:34:38 +0800 Subject: [PATCH 009/329] =?UTF-8?q?=E3=80=9012077=2019048-=E6=B3=A8?= =?UTF-8?q?=E5=A1=91=EF=BC=8C=E5=96=B7=E6=B6=82=EF=BC=8C=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=94=9F=E4=BA=A7=E6=8A=A5=E8=A1=A8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=97=A0=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5=E5=86=85?= =?UTF-8?q?=E5=AE=B9-20201026=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 48 ++++++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 9a7debb..113971f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -363,14 +363,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { private Integer isFictive = 2; @Transient - @ApiParam("圈数") - private Integer rounds; - - @Transient - @ApiParam("小车号") - private String smallCarNo; - - @Transient @ApiParam("行颜色") private String rowColor; @@ -390,6 +382,46 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("生产节拍") private Integer takt; + /********************** 动态冗余字段（界面维护大写） *********************************/ + + @Transient + @ApiParam("基准时间") + private String standardDate; + + @Transient + @ApiParam("圈数") + private Integer rounds; + + @Transient + @ApiParam("节拍") + private Integer chainSpeed; + + @Transient + @ApiParam("小车号") + private String smallCarNo; + + @Transient + @ApiParam("小车数量") + private Integer smallCarAmount; + + @Transient + @ApiParam("标包") + private Integer standardPackage; + + @Transient + @ApiParam("包规代码") + private String packageGauge; + + @Transient + @ApiParam("反喷标识") + private String reverseSprayMark; + + @Transient + @ApiParam("模具编号集合") + private String mouldCodeList; + + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From 46c22020bd33b6c8183848907190eb75dcb20d54 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Nov 2020 16:48:08 +0800 Subject: [PATCH 010/329] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E7=BC=BA=E9=99=B7=E5=A2=9E=E5=8A=A0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BB=A3=E7=A0=81?= 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 ++ .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 ++ 2 files changed, 4 insertions(+) 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 7188498..4d2d890 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 @@ -815,6 +815,8 @@ public class MesEnumUtil { public enum MES_TYPE_CFG { DEFECT("DEFECT", "缺陷"), + POLISHING("POLISHING", "抛光"), + DISASSEMBLE("DISASSEMBLE", "拆解"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), 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 95ed07f..abfa556 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 @@ -445,6 +445,8 @@ public class MesPcnEnumUtil { public enum MES_TYPE_CFG { DEFECT("DEFECT", "缺陷"), + POLISHING("POLISHING", "抛光"), + DISASSEMBLE("DISASSEMBLE", "拆解"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), From a2cf356516f874d95aa515a2b847e0db6dc948cf Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 3 Nov 2020 17:42:51 +0800 Subject: [PATCH 011/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9mysql=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E7=89=88=E6=9C=AC=20=E5=85=BC=E5=AE=B9mysql8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 337c41d..1551917 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 @@ -1962,7 +1962,9 @@ public class CommonEnumUtil { } private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval + return "jdbc:mysql://"+host+":"+port+"/"+database+ + "?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true"; } private String getJDBCUrlOracle(String database,String host,Integer port){ From 12224ed8df2f2949e0b93ad0a4a6ff4db3c88642 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Nov 2020 17:54:20 +0800 Subject: [PATCH 012/329] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=A1=A8=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=20=EF=BC=9AworkCenterCode=20workOrderStatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 113971f..8bb9074 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -26,10 +26,13 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}, - uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) - }) +@Table(name = "MES_WORK_ORDER", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WO_STATUS") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +}) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; From b9fef07d7fdbc11d126b4f500c4a1b2f3e057f51 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Nov 2020 21:37:46 +0800 Subject: [PATCH 013/329] =?UTF-8?q?=E6=80=BB=E8=A3=85=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java index ee6e90b..bbf317e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java @@ -15,6 +15,9 @@ public class AssembleDefectModel { @ApiParam("工作中心代码") private String workCenterCode; + @ApiParam("工单号") + private String workOrderNo; + @ApiParam("过程条码") private String serialNumber; From ece1ca4c01b933c6c10584f1da2f24b260075470 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 4 Nov 2020 09:28:44 +0800 Subject: [PATCH 014/329] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=BF=94=E5=9B=9E=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=AD=E8=88=AApcn=E5=8E=9F=E6=9D=90=E6=96=99=E4=B8=8A?= =?UTF-8?q?=E7=BA=BFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesShiftGroup.java | 5 ++++ .../pojo/mes/model/MesAndonManageQueueModel.java | 33 ++++++++++++++++++++++ .../mes/model/MesBoardWorkCenterOverviewModel.java | 2 +- .../mes/model/MesBoardWorkCenterStatusModel.java | 31 ++++++++++++++++++++ .../pojo/mes/model/MesWorkCellStatusModel.java | 15 ++++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 2 +- 7 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java 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 abfa556..312c1f6 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 @@ -1182,7 +1182,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_TYPE { - GET_MES_DATA(1, "pcn获取mes数据"), + GET_MES_DATA(1, "pcn拉取mes数据"), DATA_TO_MES(2, "pcn推送数据至mes"); private int value; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 6a01945..ab59fa1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -45,4 +46,8 @@ public class MesShiftGroup extends BaseBean implements Serializable { @Column(name = "SQUAD_LEADER") @ApiParam("班长") private String squadLeader; + + @Transient + @ApiParam("班组数") + private String count; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java new file mode 100644 index 0000000..59a4d30 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * + */ + +/** + * @Description: 中航-工位停线原因（取AndonManageQueue数据） + * @CreateDate: 2020/11/2 + * @Author: simon.song + */ +@Data +public class MesAndonManageQueueModel { + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("故障名称") + private String acDesc; + + @ApiParam("故障来源") + private String workCellNameRdd; + + @ApiParam("安灯类型") + private String alarmDetailNameRdd; + + @ApiParam("事件描述") + private String ecDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java index 7d51b88..586c574 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java @@ -30,5 +30,5 @@ public class MesBoardWorkCenterOverviewModel { List workOrderList; @ApiParam("班组信息") - List shiftGroupList; + MesShiftGroup shiftGroup; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java new file mode 100644 index 0000000..41a9001 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 中航-产线状态图 + * @CreateDate: 2020/11/2 + * @Author: simon.song + */ +@Data +public class MesBoardWorkCenterStatusModel { + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("实时节拍") + private String realTimeTakt; + + @ApiParam("工位状态列表") + private List workCellStatusList; + + @ApiParam("工位停线原因") + private List workCellStopLineList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java new file mode 100644 index 0000000..9507a38 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MesWorkCellStatusModel { + + @ApiParam("工位运行状态") + private String cellStatus; + + @ApiParam("工作单元代码") + private String workCellCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 81613fd..f585b43 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -106,7 +106,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; From 8a648eab7442012e8dedd5c888ace04d0bff1793 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 4 Nov 2020 10:48:49 +0800 Subject: [PATCH 015/329] =?UTF-8?q?=E6=96=B0=E5=A2=9Emysql=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 1551917..04a5b7f 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 @@ -1962,9 +1962,13 @@ public class CommonEnumUtil { } private String getJDBCUrlMySQL(String database,String host,Integer port){ - //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval + //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST return "jdbc:mysql://"+host+":"+port+"/"+database+ - "?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true"; + "?autoReconnect=true" + + "&useSSL=false" + + "&characterEncoding=utf-8" + + "&allowPublicKeyRetrieval=true" + + "&serverTimezone=CST"; } private String getJDBCUrlOracle(String database,String host,Integer port){ From 250d2fbf14182ec2a86c56b8c34cf865d4104449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 4 Nov 2020 13:40:47 +0800 Subject: [PATCH 016/329] =?UTF-8?q?=E3=80=902932=2011=202.3.3QMES=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index d350c54..77d9324 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -167,6 +167,14 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; + @Transient + @ApiParam("班组") + private String shiftGroup; + + @Transient + @ApiParam("客户名称") + private String custName; + public MesPackage() { } @@ -198,4 +206,16 @@ public class MesPackage extends BaseBean implements Serializable { this.defectActionType = defectActionType; this.createDatetime = createDatetime; } + + public MesPackage(String partNo, String partNameRdd,String workCenterCode, String workOrderNo, + String packageNo, String lotNo, String custCode, String shiftGroup) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.workOrderNo = workOrderNo; + this.packageNo = packageNo; + this.lotNo = lotNo; + this.custCode = custCode; + this.shiftGroup = shiftGroup; + } } From 67419496cb6fac41d9760ac9d75f1a8884fbbdef Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 4 Nov 2020 14:46:44 +0800 Subject: [PATCH 017/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 11 ++++++++++- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 79bb4c4..fc673d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -10,7 +10,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单条码信息 @@ -167,6 +171,11 @@ public class WmsMoveSnSnapshot extends SnapshotBean { @ApiParam("供应商编号") private String vendorNo; + @Column(name = "LEFT_CODE") + @ApiParam(value = "生产批次") + private String leftCode; + + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") 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 0cd559a..cd0c07a 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 @@ -1373,6 +1373,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { From 2f81a0f35d5c65ed645c18e99ba74125c6779a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 4 Nov 2020 15:09:31 +0800 Subject: [PATCH 018/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java | 11 +++++++++++ .../cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 11 ++++++++++- .../java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 9 +++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java index e40623b..004561a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + @Data public class MgnBoardAreaYieldModel { @@ -15,4 +17,13 @@ public class MgnBoardAreaYieldModel { @ApiParam("注塑") private MgnBoardListModel injectMoldBoardListModel; + @ApiParam("组装集合") + private List assembleBoardListModelList; + + @ApiParam("涂装集合") + private List paintBoardListModelList; + + @ApiParam("注塑集合") + private List injectMoldBoardListModelList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 8ad36ad..7c6d1aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -38,10 +38,19 @@ public class MgnBoardListModel { @ApiParam("计划完成率") private String planCompleteRate; - @ApiParam("异常数量") + @ApiParam("呼叫异常数量") private Integer exceptQty; + @ApiParam("响应异常数量") + private Integer responseQty; + @ApiParam("正常数量") private Integer normalQty; + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("车间") + private String areaCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index b55ccd2..fcf9501 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -65,4 +66,12 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("不良汇总列值") private List defectValueList; + @Transient + @ApiParam("开始工单") + private String workOrderNoStart; + + @Transient + @ApiParam("结束工单") + private String workOrderNoEnd; + } From 48a678cc16d25b48d44f7f7dc53de374dfabd167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 4 Nov 2020 15:44:25 +0800 Subject: [PATCH 019/329] =?UTF-8?q?=E3=80=9012116=2019048-=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E7=9B=91=E6=8E=A7-=E5=8F=82=E6=95=B0=E4=B8=AD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8F=92=E5=85=A5=E6=9D=A1=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E4=BE=9D=E6=97=A7=E6=8F=90=E7=A4=BA=E8=BF=87=E7=A8=8B=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=9C=A8=E7=B3=BB=E7=BB=9F=E4=B8=AD=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8-20201030=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 14 +++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 4dc2203..1b131b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -52,7 +52,7 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam("标准包规数量") - private Double partSpecQty; + private Double partSpecQty = 0d; @Column(name = "CATEGORY_CODE1") @ApiParam("分类1") @@ -84,15 +84,15 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private Integer processMatchType; + private Integer processMatchType = 0; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") - private Integer packageMatchType; + private Integer packageMatchType = 0; @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") - private Integer productMatchType; + private Integer productMatchType = 0; @Column(name = "PPT_CODE") @ApiParam("产品类型代码") @@ -100,7 +100,7 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "PART_TRAIT") @ApiParam("物料特性") - private Integer partTrait; + private Integer partTrait = 0; @Column(name = "COLOR_CODE") @ApiParam("颜色代码") @@ -112,11 +112,11 @@ public class MesPart extends BaseBean implements Serializable { @Column(name = "SHELVES_AMOUNT") @ApiParam("挂架数") - private Integer shelvesAmount; + private Integer shelvesAmount = 0; @Column(name = "QUANTITY_PER_RACK") @ApiParam("挂架可放零件数") - private Integer quantityPerRack; + private Integer quantityPerRack = 0; @Column(name = "PAINT_TANK_CODE") @ApiParam("供漆罐代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 8bb9074..2286808 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -397,7 +397,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Transient @ApiParam("节拍") - private Integer chainSpeed; + private String chainSpeed; @Transient @ApiParam("小车号") @@ -405,11 +405,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Transient @ApiParam("小车数量") - private Integer smallCarAmount; + private String smallCarAmount; @Transient @ApiParam("标包") - private Integer standardPackage; + private String standardPackage; @Transient @ApiParam("包规代码") From be7f6a4a92db758882db1eb8768c1e1a2c8dc2be Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Wed, 4 Nov 2020 16:10:47 +0800 Subject: [PATCH 020/329] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= 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, 4 insertions(+) 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 35bcf37..dce7352 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 @@ -162,6 +162,10 @@ public class WmsPOMasterDetails extends BaseBean { private String dateCode; @Transient + @ApiParam(value = "颜色控制") + private String color; + + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; From 06c3992b982f0a8094cb0467b05006408bbd23f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 4 Nov 2020 16:21:54 +0800 Subject: [PATCH 021/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 7c6d1aa..5593de3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -53,4 +53,7 @@ public class MgnBoardListModel { @ApiParam("车间") private String areaCode; + @ApiParam("产线集合") + private List workCenterList; + } From 9bf8018ac14278471bcfb4f689251156079079bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 4 Nov 2020 17:25:03 +0800 Subject: [PATCH 022/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MgnBoardListColorModel.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java new file mode 100644 index 0000000..711d0ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardListColorModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("颜色") + private String color; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 5593de3..cce2193 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -54,6 +54,6 @@ public class MgnBoardListModel { private String areaCode; @ApiParam("产线集合") - private List workCenterList; + private List workCenterList; } From d819821234cb6d448c843149d7809d427da14b0f Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Wed, 4 Nov 2020 17:53:20 +0800 Subject: [PATCH 023/329] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= 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, 3 insertions(+), 1 deletion(-) 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 a84874b..21110ed 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 @@ -470,7 +470,8 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { + public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { + System.out.println("=======参数方法"); this.createDatetime = createDatetime; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; @@ -478,6 +479,7 @@ public class WmsDocMovementDetails extends BaseBean { this.itemStatus= itemStatus; this.orderNo = orderNo; this.partNo=partNo; + this.srcZoneNo = srcZoneNo; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From 346a5088ffd4bf2cefeab46f392e685b3847cf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 4 Nov 2020 18:04:00 +0800 Subject: [PATCH 024/329] BUG#12231 --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 542301e..6def198 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -16,6 +16,7 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; import java.util.List; +import java.util.Map; /** * @Description : 库存信息 @@ -169,6 +170,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "应有数量") private Double theoryQty; + @Transient + @ApiParam(value = "差异数量MAP") + private Map> differenceQtyMap; + public Integer getIsSnapshot() { return this.isSnapshot == null ? 0 : this.isSnapshot; @@ -362,4 +367,11 @@ public class WmsStockQuan extends BaseBean { this.partNameRdd = partNameRdd; this.qty = qty; } + public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } From 48c1d2c1c83924f22e3206d00cdba61512eb422d Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 4 Nov 2020 21:26:08 +0800 Subject: [PATCH 025/329] =?UTF-8?q?feat(tj)=20=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 04a5b7f..70ebd4e 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 @@ -1961,8 +1961,10 @@ public class CommonEnumUtil { return null; } + + // cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest private String getJDBCUrlMySQL(String database,String host,Integer port){ - //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST + // 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST return "jdbc:mysql://"+host+":"+port+"/"+database+ "?autoReconnect=true" + "&useSSL=false" + From e775db87fad77b4704944007052dcc7dba14c88c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Nov 2020 21:27:06 +0800 Subject: [PATCH 026/329] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E6=8F=92=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.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/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 2286808..116caa0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -84,7 +84,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Column(name = "IS_PULL") @ApiParam("是否投料") - private Integer isPull = 2; + private Integer isPull = 1; @Column(name = "WO_TYPE") @ApiParam("工单类型") From 0be2231995341db4f1d31c60354b501a35bdb0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 5 Nov 2020 10:18:14 +0800 Subject: [PATCH 027/329] =?UTF-8?q?=E3=80=9012238=2019073-=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E6=8A=A5=E8=A1=A8-=E9=80=9A=E7=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A4=B1=E6=95=88=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/andon/sqlpack/AndonHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 9038150..0a111a3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -51,6 +51,7 @@ public class AndonHqlPack { public static DdlPackBean getAndonMessageRecord(AndonMessageRecord andonMessageRecord) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean); From 85d2f03b55b776739b8d4390f66b34f08c070bd5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 5 Nov 2020 10:44:22 +0800 Subject: [PATCH 028/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 48 +++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) 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 1d94a09..b70f563 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 @@ -867,7 +867,8 @@ public class WmsEnumUtil { WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), OTHER_IN(730, "OTHER_IN", "其它入库"), - OTHER_OUT(740, "OTHER_OUT", "其它出库"); + OTHER_OUT(740, "OTHER_OUT", "其它出库"), + COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"); private int value; private String code; @@ -9290,6 +9291,51 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * WMS数据库类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_DB_TYPE { + MYSQL(10, "mysql", "mysql"), + SQLSERVER(20, "sqlserver", "sqlserver"); + + private int value; + private String code; + private String description; + + WMS_DB_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } From eb9e520d7655c433d9a8f557d609e5ee026b035d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 5 Nov 2020 11:05:15 +0800 Subject: [PATCH 029/329] =?UTF-8?q?fix(form):=E5=88=86=E9=A1=B5=E5=A4=B1?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/common/PagerHelper.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 54dacc8..80a2fb7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -80,4 +80,30 @@ public class PagerHelper { Pager newPager = getPager(oldPager.getPageSize(), oldPager.getCurrentPage(), rowCount); return newPager; } + + public static void refreshPager(Pager pager,int rowCount){ + pager.setPageSize(pager.getPageSize() == 0 ? 10 : pager.getPageSize()); + pager.setTotalRows(rowCount); + + int totalPages = rowCount / pager.getPageSize(); + int mod = rowCount % pager.getPageSize(); + if (mod > 0) { + totalPages++; + } + pager.setTotalPages(totalPages); + if(pager.getCurrentPage() > totalPages) { + pager.setCurrentPage(totalPages); + } + + int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize(); + pager.setStartRow(startRow); + + int endRow; + if (startRow + pager.getPageSize() <= rowCount) { + endRow = startRow + pager.getPageSize() - 1; + } else { + endRow = rowCount; + } + pager.setEndRow(endRow); + } } From faf9bd4b14ad20e2c90d5ae78df0bd3b96393408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 5 Nov 2020 11:29:29 +0800 Subject: [PATCH 030/329] =?UTF-8?q?fix(form):=E5=88=86=E9=A1=B5=E5=A4=B1?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 80a2fb7..9f449f4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -96,7 +96,7 @@ public class PagerHelper { } int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize(); - pager.setStartRow(startRow); + pager.setStartRow(startRow == 0 ? 1 : startRow); int endRow; if (startRow + pager.getPageSize() <= rowCount) { From 8d66424bf611202271a37d1e5dcd62fa461faaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 5 Nov 2020 13:47:13 +0800 Subject: [PATCH 031/329] =?UTF-8?q?fix(form):=E5=88=86=E9=A1=B5=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 9f449f4..80a2fb7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -96,7 +96,7 @@ public class PagerHelper { } int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize(); - pager.setStartRow(startRow == 0 ? 1 : startRow); + pager.setStartRow(startRow); int endRow; if (startRow + pager.getPageSize() <= rowCount) { From 6aeb6bdddeaf72d6701fc175550a0a8fe6131f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 5 Nov 2020 16:56:41 +0800 Subject: [PATCH 032/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java index 04ac902..075da09 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -48,4 +48,7 @@ public class MgnBoardAssembleCompRateModel { @ApiParam("最终良品率") private String finalQualifiedRate; + @ApiParam("不良描述") + private String defectMemo; + } From 0ea3354b70e66a4216d141033a2258ebc4425083 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Thu, 5 Nov 2020 17:09:22 +0800 Subject: [PATCH 033/329] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E6=97=B6=E9=97=B4=E5=92=8Ccount=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 dce7352..4005ae5 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 @@ -228,6 +228,14 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("erp单号") private String erpSrcNo; + @Transient + @ApiParam("汇总数量") + private Double sumQty; + + @Transient + @ApiParam("汇总收货数量") + private Double sumRcQty; + /** * 状态:1=新建,10=收货中,20=收货完成, @@ -326,15 +334,15 @@ public class WmsPOMasterDetails extends BaseBean { this.itemStatus = itemStatus; } - public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double qty,Double rcQty) { + public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double sumQty,Double sumRcQty) { this.orderNo = orderNo; this.planDate=planDate; this.planTime=planTime; - this.qty = qty; - this.rcQty = rcQty; this.vendorNo=vendorNo; this.dock=dock; this.poStatus=poStatus; + this.sumQty = sumQty; + this.sumRcQty = sumRcQty; } } From ae1bb4376469f4701caa87b5d082d2c118942769 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 5 Nov 2020 23:23:01 +0800 Subject: [PATCH 034/329] =?UTF-8?q?mgn-bj=20edi=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 3 +++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 3 ++- .../pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 21 +++++++++++++++++++++ .../i3plus/pojo/mes/model/mgn/bj/edi/Part.java | 5 ----- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 6c046d9..bc61bd2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -74,6 +74,9 @@ public class AndonBoardModel implements Serializable { @ApiParam("图表类型颜色") private String color; + @ApiParam("停线时间比率") + private Integer downtimeRate; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 6b1f00b..8524845 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -202,10 +202,11 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.workType = workType; this.orderNo = orderNo; } - public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, String workCenterCode, String workCellCode) { + this.id = id; this.seq = seq; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 6640422..c1994c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -31,10 +31,16 @@ public class MgnBjBoardModel implements Serializable { private Integer warnQty; @ApiParam("预警率") private Integer warnRate; + @ApiParam("目标数量") + private Integer targetQty; + @ApiParam("计划　数量") + private Integer planQty; @ApiParam("目标合格率") private Integer targetRate = 0; @ApiParam("一次合格率") private Integer onceQualityRate = 0; + @ApiParam("待生产订单数量") + private Integer waitProduceQty = 0; @ApiParam(value = "显示颜色") private String color; @@ -42,6 +48,21 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("x坐标内容") private String xAxis; + @ApiParam("班次名称") + private String shiftName; + + @ApiParam("班次人数") + private Integer shiftNum; + + @ApiParam("产品位置代码") + private String produceCategoryCode; + + @ApiParam("产品位置名称") + private String produceCtgyName; + + @ApiParam("时段") + private String timeInterval; + @ApiParam("x坐标内容") private List xAxisList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java index a1b7261..50c452d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java @@ -5,8 +5,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; /** * @author Wynne.Lu @@ -57,8 +55,5 @@ public class Part implements Serializable { @ApiParam("Mes物料号") private String partNo; - @ApiParam("单元格编号") - private Map cellNoMap = new HashMap<>(); - } From 08011a57226c79a8a4f5e7909eec17e069362655 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 6 Nov 2020 00:52:16 +0800 Subject: [PATCH 035/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 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 21110ed..bec1faf 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -380,6 +381,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "最早需求时间") private String firstTime; + @Transient + @ApiParam(value = "处理中/创建中订单总数量") + private Long handleItemCount; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } @@ -412,6 +417,13 @@ public class WmsDocMovementDetails extends BaseBean { return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); } + public String getLine() { + if (StringUtil.isEmpty(this.line)) { + return ""; + } + return this.line; + } + @Version @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") @@ -470,16 +482,27 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) { - System.out.println("=======参数方法"); + public WmsDocMovementDetails (String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String partNo) { this.createDatetime = createDatetime; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; this.createUser = createUser; this.itemStatus= itemStatus; this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; this.partNo=partNo; + } + + + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount) { + this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.createUser = createUser; + this.itemStatus = itemStatus; + this.orderNo = orderNo; + this.handleItemCount = handleItemCount; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From cd2076d66a2444c4919bbb48f0bea71f5aa860af Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 6 Nov 2020 01:31:09 +0800 Subject: [PATCH 036/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 bec1faf..dc856c6 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 @@ -494,7 +494,7 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount) { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount, String planTime) { this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; this.srcLocateNo = srcLocateNo; @@ -503,6 +503,7 @@ public class WmsDocMovementDetails extends BaseBean { this.itemStatus = itemStatus; this.orderNo = orderNo; this.handleItemCount = handleItemCount; + this.planTime = planTime; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From c0d52b93f71c7b909bb1dd7532c835da23b8fafa Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 6 Nov 2020 02:26:09 +0800 Subject: [PATCH 037/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 9 +++------ 1 file changed, 3 insertions(+), 6 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 dc856c6..d9348ba 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 @@ -320,7 +320,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "订单总数量") - private Integer itemCount; + private Long itemCount; @Transient @ApiParam(value = "完成订单数量") @@ -381,9 +381,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "最早需求时间") private String firstTime; - @Transient - @ApiParam(value = "处理中/创建中订单总数量") - private Long handleItemCount; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -494,7 +491,7 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount, String planTime) { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planTime, Long itemCount) { this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; this.srcLocateNo = srcLocateNo; @@ -502,8 +499,8 @@ public class WmsDocMovementDetails extends BaseBean { this.createUser = createUser; this.itemStatus = itemStatus; this.orderNo = orderNo; - this.handleItemCount = handleItemCount; this.planTime = planTime; + this.itemCount = itemCount; } public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { From 29a5d01620bf42645852f482772730d2c1446fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 6 Nov 2020 18:27:30 +0800 Subject: [PATCH 038/329] BUG#2938 --- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 36 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 12 ++++---- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 0e24a09..2b75be8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -1,6 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -85,6 +89,38 @@ public class WmsQCDetails extends BaseBean { public transient Integer lockVersion; @Transient + @ApiParam(value = "单据状态") + public Integer orderStatus; + + @Transient @ApiParam(value = "供应商编号") public String vendorNo; + + @Transient + @ApiParam(value = "供应商名称") + public String vendorDesc; + + public WmsQCDetails() { + } + + public WmsQCDetails(String partNo, String partNameRdd, String item, + Double qty, String unit, String orderNo, + Integer itemStatus, String remark, Double factQty, + Double passQty, Double rejectQty, + Integer orderStatus, String vendorNo,String vendorDesc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.item = item; + this.qty = qty; + this.unit = unit; + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.remark = remark; + this.factQty = factQty; + this.passQty = passQty; + this.rejectQty = rejectQty; + this.orderStatus = orderStatus; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 8fe824f..60fb5e9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -103,8 +103,8 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "供应商全称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", - searchColumnName = "vendorNo,VendorDesc", listColumnName = "vendorNo,VendorDesc", explicitColumnName = "vendorNo") - private String VendorDesc; + searchColumnName = "vendorNo,vendorDesc", listColumnName = "vendorNo,vendorDesc", explicitColumnName = "vendorNo") + private String vendorDesc; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") @@ -146,10 +146,10 @@ public class WmsQCMaster extends BaseBean { this.partNo = partNo; } - public WmsQCMaster(String orderNo, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + public WmsQCMaster(String orderNo, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { this.orderNo = orderNo; this.vendorNo = vendorNo; - this.VendorDesc = VendorDesc; + this.vendorDesc = vendorDesc; this.refType = refType; this.refSrc = refSrc; this.partNo = partNo; @@ -157,11 +157,11 @@ public class WmsQCMaster extends BaseBean { this.createDatetime = createDatetime; } - public WmsQCMaster(String orderNo, Double qty, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + public WmsQCMaster(String orderNo, Double qty, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { this.orderNo = orderNo; this.qty = qty; this.vendorNo = vendorNo; - this.VendorDesc = VendorDesc; + this.vendorDesc = vendorDesc; this.refType = refType; this.refSrc = refSrc; this.partNo = partNo; From 2ca398468fab5f65e2b15c34cdfcd1ffcae21d78 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Fri, 6 Nov 2020 19:32:39 +0800 Subject: [PATCH 039/329] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 29 ++++++++++++++++++++++ 1 file changed, 29 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 d9348ba..21d4aae 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 @@ -641,4 +641,33 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.planTime = planTime; } + public WmsDocMovementDetails (String erpSrcNo,String orderNo,String projectNo,Double qty,Double pickQty, + String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + this.erpSrcNo = erpSrcNo; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + this.partNo = partNo; + this.itemStatus = itemStatus; + + } + + public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty, + String planDate,String planTime,String custNo,String partNo,Integer itemStatus ) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.projectNo = projectNo; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + this.partNo = partNo; + this.itemStatus = itemStatus; + + } + } From 77d8aa4bdd58c6267e1d1aadccb057201893af18 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Fri, 6 Nov 2020 21:47:36 +0800 Subject: [PATCH 040/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8B=89=E5=8A=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 74 ++++++++++++++++++++++ .../wms/dbinterface/WmsInterfaceDataRecord.java | 69 ++++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java 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 1d94a09..8557749 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 @@ -7321,6 +7321,80 @@ public class WmsEnumUtil { } /** + * 报文校验类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INTERFACE_DATA_VERIFY_STATUS { + INITIAL(10, "INITIAL", "初始化"), + COMPLETED(30, "COMPLETED", "校验完成"), + ERROR(40, "ERROR", "校验出错"); + + private int value; + private String code; + private String description; + + INTERFACE_DATA_VERIFY_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static INTERFACE_DATA_VERIFY_STATUS codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** * 运费单审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java new file mode 100644 index 0000000..7f5f46c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.wms.dbinterface; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * WMS - SAP 中间数据库接口映射关系 + * + * @author Rock.Yu + * @since 2019-06-09 20:08 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_INTERFACE_DATA_RECORD") +@Api("接口数据收发记录") +public class WmsInterfaceDataRecord extends BaseBean { + private static final long serialVersionUID = 4139055040492108499L; + + @ApiParam("来源表名") + @Column(name = "SRC_TABLE_NAME", length = 50) + public String srcTableName; + + @ApiParam("目标实体对象的名字，多个字段用半角逗号分隔") + @Column(name = "DEST_BEAN_NAME", length = 500) + public String destBeanName; + + @ApiParam("软适配编号") + @Column(name = "SOFT_ADAPATOR_CODE") + public String softAdaptorCode; + + @ApiParam("接口名称") + @Column(name = "INTERFACE_NAME") + public String interfaceName; + + @ApiParam("报文唯一编号") + @Column(name = "SID") + public Long sid; + + @ApiParam("MOVE_TO_ERP表的ID") + @Column(name = "MOVE_TO_ERP_ID") + public Long moveToErpID; + + @ApiParam("报文校验状态") + @Column(name = "VERIFY_STATUS") + @ColumnDefault("10") + @AnnoOutputColumn(refClass = WmsEnumUtil.INTERFACE_DATA_VERIFY_STATUS.class, refForeignKey = "value", value = "description", required = false) + public int verifyStatus; + + @ApiParam("备注信息") + @Column(name = "REMARK") + public String remark; +} From 274191aee2108686aaa4d2e59663ae77522e594e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 7 Nov 2020 00:23:12 +0800 Subject: [PATCH 041/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 21d4aae..1ef109a 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 @@ -491,7 +491,7 @@ public class WmsDocMovementDetails extends BaseBean { } - public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planTime, Long itemCount) { + public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String planDate, String planTime, Long itemCount) { this.createDatetime = createDatetime; this.srcZoneNo = srcZoneNo; this.srcLocateNo = srcLocateNo; @@ -499,6 +499,7 @@ public class WmsDocMovementDetails extends BaseBean { this.createUser = createUser; this.itemStatus = itemStatus; this.orderNo = orderNo; + this.planDate = planDate; this.planTime = planTime; this.itemCount = itemCount; } From 1680314d49b5450f313f4b12564cb2c7dfb49167 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Sat, 7 Nov 2020 13:39:32 +0800 Subject: [PATCH 042/329] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= 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 b70f563..c92988c 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 @@ -795,6 +795,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"), + BUSI_TYPE_NEW(480, "BUSI_TYPE_NEW", "新增业务类型"), CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"), OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"), ALLOCATION(40, "ALLOCATION", "调拨"), From bc3e94923fc10fa72c1390761c962a2fbacfca6f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 7 Nov 2020 14:16:44 +0800 Subject: [PATCH 043/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E7=9A=84=E7=B1=BB=E5=9E=8B?= 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 75bb7ae..89b2f51 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 @@ -9373,7 +9373,9 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_DB_TYPE { MYSQL(10, "mysql", "mysql"), - SQLSERVER(20, "sqlserver", "sqlserver"); + SQLSERVER(20, "sqlserver", "sqlserver"), + ORACLE(30, "oracle", "oracle"), + POSTGRESQL(40, "postgresql", "postgresql"); private int value; private String code; From 7162664b79a5d1ca74a579098067da71e2eab97e Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 7 Nov 2020 20:00:27 +0800 Subject: [PATCH 044/329] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0SID=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 7 +++++++ .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java | 10 +++++++++- .../pojo/wms/repository/WmsInterfaceDataRecordRepository.java | 9 +++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java 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 27e1ab2..d9b5dd4 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 @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * WMS - SAP 中间数据库接口映射关系 @@ -177,4 +178,10 @@ public class WmsInterfaceDataMapper extends BaseBean { @ApiParam("接口名称") @Column(name = "INTERFACE_NAME") public String interfaceName; + + /** + * 本次发送报文使用的 SID + */ + @Transient + public Long sid; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index 7f5f46c..c060cd6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -28,7 +29,14 @@ import javax.persistence.Table; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_INTERFACE_DATA_RECORD") +@Table(name = "WMS_INTERFACE_DATA_RECORD", indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SRC_TABLE_NAME"), + @Index(columnList = "DEST_BEAN_NAME"), + @Index(columnList = "SOFT_ADAPATOR_CODE"), + @Index(columnList = "SID"), + @Index(columnList = "MOVE_TO_ERP_ID") +}) @Api("接口数据收发记录") public class WmsInterfaceDataRecord extends BaseBean { private static final long serialVersionUID = 4139055040492108499L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java new file mode 100644 index 0000000..eea6e36 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataRecordRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataRecord; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsInterfaceDataRecordRepository extends BaseRepository { +} From 303fe5907d26a6c90e3dbc2ca765397533568f89 Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Sat, 7 Nov 2020 21:59:59 +0800 Subject: [PATCH 045/329] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?asn=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 5d1e4b0..3c2b908 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -136,6 +136,10 @@ public class WmsZones extends BaseBean { @ApiParam(value = "子存储区列表") private List childList; + @Transient + @ApiParam(value = "库位利用率百分比") + private String Location; + public WmsZones(String zoneNo) { this.zoneNo = zoneNo; } From 679ef67457c0b1b4f1c810886923ea8fc4780364 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 8 Nov 2020 02:04:53 +0800 Subject: [PATCH 046/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../pojo/wms/bean/WmsDocMovementDetails.java | 31 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 6 +++++ 3 files changed, 38 insertions(+), 1 deletion(-) 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 89b2f51..674a987 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 @@ -795,7 +795,6 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"), - BUSI_TYPE_NEW(480, "BUSI_TYPE_NEW", "新增业务类型"), CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"), OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"), ALLOCATION(40, "ALLOCATION", "调拨"), @@ -842,6 +841,7 @@ public class WmsEnumUtil { KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), + FINISH_PRODUCT_SHPING_NEW(480, "FINISH_PRODUCT_SHPING_NEW", "成品发运-新业务类型"), KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), 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 1ef109a..3d469ee 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 @@ -381,6 +381,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "最早需求时间") private String firstTime; + @Transient + @ApiParam(value = "实际发运时间") + private String actualPlanTime; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -461,6 +465,15 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("窗口领料结束时间") private String windowPickEndTime; + @Transient + @ApiParam("项目编号") + String prodCfgTypeCode; + + @Transient + @ApiParam("项目名称") + String prodCfgTypeName; + + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) { this.custNo = custNo; this.orderNo = orderNo; @@ -671,4 +684,22 @@ public WmsDocMovementDetails (String partNo,String orderNo) { } + public WmsDocMovementDetails(String erpSrcNo, String orderNo, String prodCfgTypeCode, String prodCfgTypeName, + Double qty, String planDate, String planTime, String custNo) { + this.erpSrcNo = erpSrcNo; + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + } + + public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode) { + this.orderNo = orderNo; + this.pickQty = pickQty; + this.prodCfgTypeCode = prodCfgTypeCode; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index d82174b..f115c0a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -359,6 +359,12 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", this.modifyUser = modifyUser; } + public WmsMoveDetails(String refSrc, String prodCfgTypeCode, String createDatetime) { + this.refSrc = refSrc; + this.prodCfgTypeCode = prodCfgTypeCode; + this.createDatetime = createDatetime; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } From 98fa35c8a0fa103bad89f3135f475f5a2650db00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 8 Nov 2020 15:53:36 +0800 Subject: [PATCH 047/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java index 1bbd48f..bf42458 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -74,5 +74,12 @@ public class MesBoardLine extends BaseBean implements Serializable { @ApiParam("最终良品率目标值") private Double planPassYield; + /** + * 是否展示： 1--展示 ，2--不展示 + */ + @Column(name = "IS_DISPLAY") + @ApiParam("是否展示") + private Integer isDisPlay; + } From e19d53de4a4f68ab5e143b8ce6946a1fe5786d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 8 Nov 2020 15:58:30 +0800 Subject: [PATCH 048/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.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/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java index bf42458..2e75537 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -79,7 +79,7 @@ public class MesBoardLine extends BaseBean implements Serializable { */ @Column(name = "IS_DISPLAY") @ApiParam("是否展示") - private Integer isDisPlay; + private Integer isDisplay; } From 5070fcc8fb0f64874c5895844115eae462cf4133 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 9 Nov 2020 13:11:56 +0800 Subject: [PATCH 049/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E7=9C=8B=E6=9D=BF=20?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=9F=A9=E9=98=B5model=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=A2=86=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java index cb9a30e..4ed3e9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java @@ -21,4 +21,6 @@ public class StaffMatrixModel { private List staffs; + private List leaders; + } From 12074e24a828928f657907994409b5e4a7b5bc1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 9 Nov 2020 14:15:41 +0800 Subject: [PATCH 050/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesBoardArea.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/MgnBoardListModel.java | 6 +++ .../mes/repository/MesBoardAreaRepository.java | 14 ++++++ 3 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java new file mode 100644 index 0000000..fcf8e78 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java @@ -0,0 +1,54 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes看板车间配置 + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-11-09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_AREA") +@Api("mes看板车间配置") +public class MesBoardArea extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4592603687011665216L; + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "PLAN_PASS_YIELD", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam("目标达成率") + private Double planPassYield; + + @Column(name = "YIELD_DIFF_VALUE", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam("上下偏差值") + private Double yieldDiffValue; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index cce2193..486deb5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -53,6 +53,12 @@ public class MgnBoardListModel { @ApiParam("车间") private String areaCode; + @ApiParam("绿线值") + private Double planPassYield; + + @ApiParam("上下偏差值") + private Double yieldDiffValue; + @ApiParam("产线集合") private List workCenterList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java new file mode 100644 index 0000000..fd1a8de --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardAreaRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardArea; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesBoardAreaRepository extends BaseRepository { +} From 26e1b391198f03e631bf0d2cf7c68397cbda8223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 9 Nov 2020 14:39:04 +0800 Subject: [PATCH 051/329] =?UTF-8?q?feat(core):=E9=82=AE=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=99=84=E4=BB=B6=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 16 +++++++++++++++- .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 ++ .../estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 394088d..75a8fea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.ArrayList; import java.util.List; /** @@ -50,10 +51,11 @@ public class SysMessage extends BaseBean { if (this.messageType == null) { return 0; } else { - return this.messageType.intValue(); + return this.messageType; } } + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_TYPE_CONTENT.class) @Column(name = "MESSAGE_TYPE_CONTENT") @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1") private Integer messageContentType; @@ -154,4 +156,16 @@ public class SysMessage extends BaseBean { @ApiParam(value = "附件集合") private List sysFileAttachList; + @Transient + @ApiParam(value = "附件id集合") + private List fileAttachIdList; + + public void addFileAttachId(Long attachId){ + if(fileAttachIdList == null){ + fileAttachIdList = new ArrayList<>(); + } + + fileAttachIdList.add(attachId); + } + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index a472e9f..694c194 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -476,6 +476,7 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean); DdlPreparedPack.getOrderDefault(message); + ddlPackBean.setOrderByStr(message.orderBy()); return ddlPackBean; } @@ -487,6 +488,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysFile(SysFile file) { + DdlPreparedPack.getOrderDefault(file); DdlPackBean result = DdlPackBean.getDdlPackBean(file); // hql拼接 diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index bce2e0d..1945d75 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -10,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -120,6 +121,19 @@ public class BsSuitCaseFTP extends BaseBean { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal()); } + @ColumnDefault("2") + @Column(name = "IS_CHECK_FILE") + @ApiParam(value = "是否校验文件") + private Integer isCheckFile; + + public boolean isCheckFile(){ + return isCheckFile != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isCheckFile); + } + + @Column(name = "CHECK_FILE_PATH") + @ApiParam(value = "校验文件路径") + private String checkFilePath; + @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath; From 39da900ae1549337340acb24bbe5d9f4a5c477b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 9 Nov 2020 15:40:35 +0800 Subject: [PATCH 052/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 486deb5..8bcab46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -53,11 +53,8 @@ public class MgnBoardListModel { @ApiParam("车间") private String areaCode; - @ApiParam("绿线值") - private Double planPassYield; - - @ApiParam("上下偏差值") - private Double yieldDiffValue; + @ApiParam("颜色") + private String color; @ApiParam("产线集合") private List workCenterList; From 2911abf1934fa69ce8899799dc860f0e3e97cf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 9 Nov 2020 18:06:17 +0800 Subject: [PATCH 053/329] =?UTF-8?q?=E3=80=9012324=2020027-PCN=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86-=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E5=B7=B2=E7=BB=8F=E5=81=9C=E7=BA=BF=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E5=9C=A8=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E7=82=B9=E5=87=BB=E6=9A=82=E5=81=9C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA=E2=80=9C90003:=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E3=80=901545=E3=80=91=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?=E5=81=9C=E7=BA=BF=E6=97=B6=E6=89=8D=E5=85=81=E8=AE=B8=E6=9A=82?= =?UTF-8?q?=E5=81=9C[=E8=AF=B7=E6=A3=80=E6=9F=A5]=E2=80=9D-20201109?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfCustOrderData.java | 83 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 4 ++ .../mes/repository/IfCustOrderDataRepository.java | 9 +++ 3 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java new file mode 100644 index 0000000..2d8aa20 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.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.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +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.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_客户月度订单数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_CUST_ORDER_DATA") +@Api("IF_客户月度订单数据") +public class IfCustOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695346L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_NAME") + @ApiParam("客户名称") + private String customerName; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("订单数量") + private Integer qty = 0; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Transient + @ApiParam("年度客户月度订单集合") + private List> ifCustOrderDataMap = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index 129d45e..cfaf6f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -57,4 +57,8 @@ public class MesCustomer extends BaseBean implements Serializable { @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") private String custDeliveryLocation; + + @Column(name = "IS_BI_DISPLAY") + @ApiParam("是否BI显示") + private Integer isBiDisplay = 2; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java new file mode 100644 index 0000000..47b1a16 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfCustOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfCustOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfCustOrderDataRepository extends BaseRepository { +} From 426a6f2026b5ab12014436f4c49c739e50b025e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 9 Nov 2020 19:00:34 +0800 Subject: [PATCH 054/329] =?UTF-8?q?feat(ftp):ftp=E9=87=8D=E8=AF=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6ff8a9c..19f713f 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 @@ -936,9 +936,9 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FTP_CONNECTION_MODE { LOCAL_ACTIVE_MODE(10, "本地主动模式"), - LOCAL_PASSIVE_MODE(20, "本地被动模式"), + LOCAL_PASSIVE_MODE(20, "本地被动模式"); // REMOTE_ACTIVE_MODE(30, "远程主动模式"), - REMOTE_PASSIVE_MODE(40, "远程被动模式"); +// REMOTE_PASSIVE_MODE(40, "远程被动模式"); private final int value; private final String description; From 4d5ffce7ac0798bf8681712f831b31b1213760d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 9 Nov 2020 19:21:47 +0800 Subject: [PATCH 055/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2933?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 6def198..b57e05f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -76,6 +76,10 @@ public class WmsStockQuan extends BaseBean { private Boolean includeZeroStock = false; @Transient + @ApiParam(value = "无差异库存显示") + private Boolean showNoDiffStock = false; + + @Transient @ColumnDefault("0") @ApiParam(value = "库存数量总和") private Double sumQty; From 7dba4e7f322802192d32b49b91008c1bbe4077ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 9 Nov 2020 19:22:50 +0800 Subject: [PATCH 056/329] BUG#12166 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index b8df6db..86f2fe7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -127,6 +127,9 @@ public class WmsLocatePart extends BaseBean { public double getMinValue(){ return this.min ==null?0:this.min.doubleValue(); } + public double getSafetyStockVal(){ + return this.safetyStock ==null?0:this.safetyStock.doubleValue(); + } public WmsLocatePart() { } From d41d14b1125eac124547b65b87b6fdc718d7f79e Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Mon, 9 Nov 2020 20:27:55 +0800 Subject: [PATCH 057/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20erp=20doc=20no=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/dbinterface/WmsInterfaceDataRecord.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index c060cd6..99798d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -33,7 +33,7 @@ import javax.persistence.Table; @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "SRC_TABLE_NAME"), @Index(columnList = "DEST_BEAN_NAME"), - @Index(columnList = "SOFT_ADAPATOR_CODE"), + @Index(columnList = "SOFT_ADAPTOR_CODE"), @Index(columnList = "SID"), @Index(columnList = "MOVE_TO_ERP_ID") }) @@ -43,35 +43,39 @@ public class WmsInterfaceDataRecord extends BaseBean { @ApiParam("来源表名") @Column(name = "SRC_TABLE_NAME", length = 50) - public String srcTableName; + private String srcTableName; @ApiParam("目标实体对象的名字，多个字段用半角逗号分隔") @Column(name = "DEST_BEAN_NAME", length = 500) - public String destBeanName; + private String destBeanName; @ApiParam("软适配编号") - @Column(name = "SOFT_ADAPATOR_CODE") - public String softAdaptorCode; + @Column(name = "SOFT_ADAPTOR_CODE") + private String softAdaptorCode; @ApiParam("接口名称") @Column(name = "INTERFACE_NAME") - public String interfaceName; + private String interfaceName; @ApiParam("报文唯一编号") @Column(name = "SID") - public Long sid; + private Long sid; @ApiParam("MOVE_TO_ERP表的ID") @Column(name = "MOVE_TO_ERP_ID") - public Long moveToErpID; + private Long moveToErpID; @ApiParam("报文校验状态") @Column(name = "VERIFY_STATUS") @ColumnDefault("10") @AnnoOutputColumn(refClass = WmsEnumUtil.INTERFACE_DATA_VERIFY_STATUS.class, refForeignKey = "value", value = "description", required = false) - public int verifyStatus; + private int verifyStatus; @ApiParam("备注信息") @Column(name = "REMARK") - public String remark; + private String remark; + + @ApiParam("ERP文档编号") + @Column(name = "ERP_DOC_NO") + private String erpDocNo; } From 71e70e9a9453dc4394b749d98e8da1a0f71f4c91 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 9 Nov 2020 20:31:03 +0800 Subject: [PATCH 058/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 3a2c1e7..3fd7418 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -240,6 +240,18 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "不等于库位类型") private Integer notLocateType; + @Transient + @ApiParam(value = "总库位") + private Integer totalQty; + + @Transient + @ApiParam(value = "已用库位") + private Integer usedQty; + + @Transient + @ApiParam(value = "空库位") + private Integer emptyQty; + public WmsLocate() { } From 755d66dbce6287ff562f95206bb43d4fc6137826 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 10 Nov 2020 10:47:29 +0800 Subject: [PATCH 059/329] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E5=81=9C=E7=BA=BF?= =?UTF-8?q?=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=8D=95=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E2=80=9C=E5=B7=A1=E6=A3=80=E9=A1=B9=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=98=8E=E7=BB=86=E8=A1=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.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/MesQcOrderRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java index e49d31d..6840515 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java @@ -16,7 +16,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description: + * @Description: MES_QC_ORDER_DETAIL表的明细表 * @Reference: * @Author: jessica.chen * @CreateDate: 2019\11\15 10:01 From 7ec1bc61b029ceaba9c4d191d3eb9bacca841a11 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 10 Nov 2020 11:26:32 +0800 Subject: [PATCH 060/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3d469ee..3dec39f 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 @@ -114,7 +114,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "紧急程度") - private String urgentStatus; + private Integer urgentStatus; @Column(name = "SRC_NO") @ApiParam(value = "源单号") From 07cd3de33f4e574d57f7f3ba721ad2f6115bb294 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Nov 2020 15:01:47 +0800 Subject: [PATCH 061/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=BC=96=E5=8F=B7=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/MesPackageDetail.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 16cf9c5..811165e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -34,6 +34,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO", nullable = false) + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 1b9e494..3082b0c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -34,6 +34,10 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO", nullable = false) + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; From 7bb60b8f6e43508fbfe60d4ddc9e2f5f88c77a41 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Nov 2020 15:09:50 +0800 Subject: [PATCH 062/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=89=E4=B8=AA=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index dac64cf..845b2c4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3540,4 +3540,67 @@ public class MesHqlPack { } return packBean; } + + /** + * MES容器位置查询条件封装 + * + * @param mesContainerLocation + * @return + */ + public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode()); + if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES产品容器容量配置查询条件封装 + * + * @param mesPartContainerCapacity + * @return + */ + public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES客户条码规则查询条件封装 + * + * @param mesCustomerSnRule + * @return + */ + public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode()); + if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean); + } + return packBean; + } } From c2f9937b37ca769f8bac369bd3bdc2287a69f195 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Nov 2020 15:18:05 +0800 Subject: [PATCH 063/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E7=83=AD=E5=A4=84=E7=90=86=E7=BF=BB=E5=8C=85=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesContainerLocation.java | 44 ++++++++++++++++ .../i3plus/pojo/mes/bean/MesCustomerSnRule.java | 59 ++++++++++++++++++++++ .../pojo/mes/bean/MesPartContainerCapacity.java | 48 ++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java new file mode 100644 index 0000000..749e502 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java @@ -0,0 +1,44 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : MES_容器位置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 17:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER_LOCATION") +@Api("MES_容器位置") +public class MesContainerLocation extends BaseBean { + + private static final long serialVersionUID = -1650212958579635634L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "LOCATION_CAPACITY") + @ApiParam(value = "默认容量") + private String locationCapacity; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java new file mode 100644 index 0000000..9fe9dff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java @@ -0,0 +1,59 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : MES_客户条码规则 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER_SN_RULE") +@Api("MES_客户条码规则") +public class MesCustomerSnRule extends BaseBean { + private static final long serialVersionUID = -7455066846136535539L; + + @Column(name = "CUSTOMER_CODE") + @ApiParam(value = "客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam(value = "客户零件号") + private String customerPartNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + private String partNo; + + @Column(name = "LENGTH") + @ApiParam(value = "长度") + private Integer length; + + @Column(name = "FROM1") + @ApiParam(value = "起始1") + private Integer from1; + + @Column(name = "TO1") + @ApiParam(value = "至1") + private Integer to1; + + @Column(name = "FIX1") + @ApiParam(value = "内容1") + private String fix1; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java new file mode 100644 index 0000000..f900c6c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java @@ -0,0 +1,48 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : MES_产品容器容量配置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_CONTAINER_CAPACITY") +@Api("MES_产品容器容量配置") +public class MesPartContainerCapacity extends BaseBean { + + private static final long serialVersionUID = 6438819635320965628L; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "CT_QTY") + @ApiParam(value = "容量") + private Integer ctQty; +} From 1ba56bc59a28e9e0436ac18c8d103c526333c512 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 10 Nov 2020 15:24:33 +0800 Subject: [PATCH 064/329] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 37 ++++++++++++++++++++++ .../pojo/mes/model/QcCheckDataResultModel.java | 7 ++-- 2 files changed, 41 insertions(+), 3 deletions(-) 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 312c1f6..cee9cc7 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 @@ -3859,6 +3859,43 @@ public class MesPcnEnumUtil { } /** + * 产线管控-过程检验状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROCESS_INSPECTION { + NOT_CREATE(10, "未创建"), + CREATE(20, "创建"), + PROCESS(30, "执行中"), + COMPLETE(40, "完成"); + + private int value; + private String description; + + PROCESS_INSPECTION(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 整体检测结果状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java index 405f089..58803e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,19 +19,19 @@ public class QcCheckDataResultModel { private Integer isFirstCheck; @ApiParam("首检结果") - private List firstCheckResult; + private List firstCheckResult; @ApiParam("是否完成巡检") private Integer isOnSiteCheck; @ApiParam("巡检结果") - private List onSiteCheckResult; + private List onSiteCheckResult; @ApiParam("是否完成尾检") private Integer isEndCheck; @ApiParam("尾检结果") - private List endCheckResult; + private List endCheckResult; public QcCheckDataResultModel() { } From 46c0206d6ac251dbf2221c9c4630547ff19a7b90 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Nov 2020 15:38:55 +0800 Subject: [PATCH 065/329] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E7=83=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BF=BB=E5=8C=85=E6=96=B0=E5=A2=9E=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84dao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 82 ++++++++++++++++++++++ .../repository/MesContainerLocationRepository.java | 16 +++++ .../repository/MesCustomerSnRuleRepository.java | 16 +++++ .../MesPartContainerCapacityRepository.java | 16 +++++ .../MesProdCtCapacityConfigRepository.java | 15 ++++ 5 files changed, 145 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java new file mode 100644 index 0000000..9ef4f8c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -0,0 +1,82 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020/10/29 14:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE") +@Api("料箱表") +public class IfPackage extends BaseBean implements Serializable { + + private static final long serialVersionUID = 9099416791684702129L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; + + @Column(name = "PORCESS_NAME") + @ApiParam("工序名称") + private String porcessName; + + @Column(name = "RK_TYPE") + @ApiParam("料架类型") + private String rkType; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + @Lob + private String errorMessage; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java new file mode 100644 index 0000000..293a1a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesContainerLocation; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesContainerLocationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java new file mode 100644 index 0000000..19f6409 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerSnRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 13:33 + * @Modify: + **/ +@Repository +public interface MesCustomerSnRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java new file mode 100644 index 0000000..3616b53 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartContainerCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2020-11-10 + * @Modify: + **/ +@Repository +public interface MesPartContainerCapacityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java new file mode 100644 index 0000000..44c6144 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdCtCapacityConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2020-11-04 + **/ +@Repository +public interface MesProdCtCapacityConfigRepository extends BaseRepository { +} From e18b6c727e7ca0b35138782a96c668628f3f1a65 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 10 Nov 2020 17:16:09 +0800 Subject: [PATCH 066/329] =?UTF-8?q?mgn-bj=E5=BC=BA=E5=88=B6=E5=B0=81?= =?UTF-8?q?=E7=AE=B1=E5=AE=8C=E6=88=90=E5=90=8E=E9=87=8D=E7=BD=AE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 54 ++++++++++++++++++++++ 1 file changed, 54 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 cee9cc7..28db666 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 @@ -5974,4 +5974,58 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 预装产线，工位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRE_WORK_CENTER_CODE { + OP10("OP10", "OP10"), + OP20A("OP20a", "OP20a"), + OP20B("OP20b", "OP20b"); + + private String code; + private String description; + + PRE_WORK_CENTER_CODE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static PRE_WORK_CENTER_CODE getByCode(String code) { + for (PRE_WORK_CENTER_CODE workCenterCode : values()) { + if (workCenterCode.getCode().equals(code)) { + return workCenterCode; + } + } + return null; + } + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 2df948207c57d7c243c795aa24afc94f0a9b8630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 10 Nov 2020 17:29:02 +0800 Subject: [PATCH 067/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.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/MesLineFaultRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java index 5380410..f755466 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java @@ -39,5 +39,5 @@ public class MesLineFaultRecord extends BaseBean implements Serializable { @Column(name = "FAULT_TIME") @ApiParam("故障时长（分）") - private Double faultTime; + private Long faultTime; } From a300e6e2f8e1e1d533a4c80b24e14471f2eca53b Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 10 Nov 2020 19:30:20 +0800 Subject: [PATCH 068/329] =?UTF-8?q?idoc=20=E8=AE=B0=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20erp=20=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/dbinterface/WmsInterfaceDataRecord.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index 99798d6..1496c14 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -35,7 +35,8 @@ import javax.persistence.Table; @Index(columnList = "DEST_BEAN_NAME"), @Index(columnList = "SOFT_ADAPTOR_CODE"), @Index(columnList = "SID"), - @Index(columnList = "MOVE_TO_ERP_ID") + @Index(columnList = "MOVE_TO_ERP_ID"), + @Index(columnList = "ERP_DOC_NO") }) @Api("接口数据收发记录") public class WmsInterfaceDataRecord extends BaseBean { @@ -78,4 +79,17 @@ public class WmsInterfaceDataRecord extends BaseBean { @ApiParam("ERP文档编号") @Column(name = "ERP_DOC_NO") private String erpDocNo; + + @ApiParam("ERP状态代码") + @Column(name = "ERP_STATUS_CODE") + private String erpStatusCode; + + @ApiParam("ERP状态描述") + @Column(name = "ERP_STATUS_DESC") + private String erpStatusDesc; + + @ApiParam("ERP最后更新时间") + @Column(name = "ERP_LAST_MODIFY_TIME") + private String erpLastModifyTime; + } From c6031c2f2860f3672b82d7286396746e3e52e432 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 10 Nov 2020 21:33:19 +0800 Subject: [PATCH 069/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 9 ++++++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 2b75be8..f225d01 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -13,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description : 质检单明细信息 @@ -61,6 +63,7 @@ public class WmsQCDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_ITEM_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; @Column(name = "REMARK") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 60fb5e9..f2131f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -54,7 +54,7 @@ public class WmsQCMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS") public Integer orderStatus; From 30382c5585ae886c344e2e606dca55c527ed15a9 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 11 Nov 2020 09:38:21 +0800 Subject: [PATCH 070/329] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E5=85=AC=E5=B7=AE?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=20=E5=85=AC=E5=B7=AE=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java | 8 ++++---- .../cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java index 1df34df..707ff42 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -99,13 +99,13 @@ public class MesQualityStandard extends BaseBean implements Serializable { @ApiParam("检验值类型") private String checkValueType; - @Column(name = "DIFFERENCE_MAX_LIMIT") + @Column(name = "maximum") @ApiParam("公差上限") - private BigDecimal differenceMaxLimit; + private BigDecimal maximum; - @Column(name = "DIFFERENCE_MIN_LIMIT") + @Column(name = "minimum") @ApiParam("公差下限") - private BigDecimal differenceMinLimit; + private BigDecimal minimum; @Column(name = "IS_KEY_CHECK_ITEM") @ApiParam("是否关键检测项") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java index dce1aa2..fc27237 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java @@ -70,10 +70,10 @@ public class MesQualityStandardModel { private String checkValueType; @ApiParam("公差上限") - private BigDecimal differenceMaxLimit; + private BigDecimal maximum; @ApiParam("公差下限") - private BigDecimal differenceMinLimit; + private BigDecimal minimum; @ApiParam("是否关键检测项") private Integer isKeyCheckItem; From 5f9d597943a751387de15d87c6c2c5de240dcbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 11 Nov 2020 10:48:28 +0800 Subject: [PATCH 071/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=AF=84=E5=AE=9A=E9=A1=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?DEC->DECEMBER?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java index f909fde..13f0eab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java @@ -111,8 +111,8 @@ public class MesBoardMafactAssessment extends BaseBean implements Serializable { @ApiParam("NOV") private String nov; - @Column(name = "DEC") - @ApiParam("DEC") - private String dec; + @Column(name = "DECEMBER") + @ApiParam("DECEMBER") + private String december; } From a1dd0fa36bd1834aec6ac138450f14d86f77067e Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 11 Nov 2020 20:10:11 +0800 Subject: [PATCH 072/329] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B4=A8=E6=A3=80=E5=8D=95=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/MesQcOrderDetailRecordModel.java | 91 ++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java new file mode 100644 index 0000000..e4d935c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQcOrderDetailRecordModel.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesQcOrderDetailRecordModel implements Serializable { + private static final long serialVersionUID = -7216132883079491432L; + + @ApiParam("检测人") + private String createUser; + + @ApiParam("检测时间") + private String createDatetime; + + @ApiParam("质检单号") + private String orderNo; + + @ApiParam("判定结果") + private Integer checkResult = 0; + + @ApiParam("检测值") + private String checkValue; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("检测顺序") + private Integer checkSeq; + + + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("是否允许让步") + private Integer isConcession = 0; + + @ApiParam("检验行号") + private Integer itemNo = 0; + +// @ApiParam("产品条码") +// private String serialNumber; + + @ApiParam("数量") + private Integer qty; + + @ApiParam("已检数量") + private Integer finishQty; + + @ApiParam("最大数") + private Double maximum = 0d; + + @ApiParam("最小数") + private Double minimum = 0d; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("数据源") + private String dataSource; + + @ApiParam("检测值类型") + private String checkValueType; + + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam(value = "检测项类型名称") + private String businessTypeName; + +} From d226c27c2beef85b561f8d134032fa256b39132f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Wed, 11 Nov 2020 20:15:27 +0800 Subject: [PATCH 073/329] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E9=99=84=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=8A=9F=E8=83=BD=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 15 ++++++++++----- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 4 +++- .../estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java | 7 ++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index f527605..8b34e26 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : 推送信息配置 @@ -60,10 +57,14 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SQL_STR", columnDefinition = "TEXT") private String sqlStr; - @ApiParam("脚本编号") + @ApiParam("数据获取脚本编号") @Column(name = "SCRIPT_NO") private String scriptNo; + @ApiParam("附件文件路径获取脚本编号") + @Column(name = "ATTACH_SCRIPT_NO") + private String attachScriptNo; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT") @@ -94,4 +95,8 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "CONTENT_LABEL") private String contentLabel; + // 临时存储 + @ApiParam("附件的文件路径") + @Transient + private String attachFilePath; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java index e22e520..b8ef2ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -48,5 +48,7 @@ public class WmsPushLog extends BaseBean{ @ApiParam("推送地址") private String pathUrl; - + @ApiParam("附件地址") + @Column(name = "ATTACH_FILE_PATH") + private String attachFilePath; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java index 8c7abb5..26a77a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -1,12 +1,8 @@ package cn.estsh.i3plus.pojo.wms.modelbean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.util.List; -import java.util.Map; - @Data public class PushMessageModel { @@ -29,5 +25,6 @@ public class PushMessageModel { @ApiParam("工厂代码") private String organizeCode; - + @ApiParam("附件的文件路径") + private String attachFilePath; } From b124db3383af029a99a87c5b8514c3da943af3f6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 11 Nov 2020 20:20:16 +0800 Subject: [PATCH 074/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= 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 +++++ .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java | 7 +++++++ 2 files changed, 12 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 674a987..7effd9e 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 @@ -1891,6 +1891,11 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java index d565516..065e3b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java @@ -58,6 +58,9 @@ public class WmsQCStatusModel { @ApiParam("标准质检时间") private Double stdCheckTime; + @ApiParam("质检时长") + private long qcCostTime; + public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) { this.asnOrderNo = asnOrderNo; this.qcOrderNo = qcOrderNo; @@ -68,4 +71,8 @@ public class WmsQCStatusModel { this.proportion = proportion; this.stdCheckTime = stdCheckTime; } + + public WmsQCStatusModel() { + + } } From 7b8597dde41b53330c4e0e21f9d67d62a2e66ae9 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 12 Nov 2020 13:25:54 +0800 Subject: [PATCH 075/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index f225d01..3c9b438 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -106,6 +106,28 @@ public class WmsQCDetails extends BaseBean { public WmsQCDetails() { } + public WmsQCDetails(String organizeCode, String partNo, String partNameRdd, String item, + Double qty, String unit, String orderNo, + Integer itemStatus, String remark, Double factQty, + Double passQty, Double rejectQty, + Integer orderStatus, String vendorNo, String vendorDesc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.item = item; + this.qty = qty; + this.unit = unit; + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.remark = remark; + this.factQty = factQty; + this.passQty = passQty; + this.rejectQty = rejectQty; + this.orderStatus = orderStatus; + this.vendorNo = vendorNo; + this.vendorDesc = vendorDesc; + } + public WmsQCDetails(String partNo, String partNameRdd, String item, Double qty, String unit, String orderNo, Integer itemStatus, String remark, Double factQty, From 2d9521e4122033ecee306474bf3fd41b9846342a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 12 Nov 2020 15:17:52 +0800 Subject: [PATCH 076/329] BUG#12166 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index f527605..73bccbf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -12,6 +12,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.util.List; +import java.util.Map; /** * @Description : 推送信息配置 @@ -64,6 +66,10 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_NO") private String scriptNo; + @ApiParam("脚本入参") + @Column(name = "SCRIPT_PARAM") + private String scriptParam; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT") @@ -94,4 +100,5 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "CONTENT_LABEL") private String contentLabel; + } From 7b6b97c1b7a6154c5a0550e82f93d98c98efe66e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 12 Nov 2020 16:56:31 +0800 Subject: [PATCH 077/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 6 ++++++ .../estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 19 +++++++++++++++++++ .../estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 20 +++++++++++++++++++- 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index c7cdeb4..d5e92b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -77,4 +77,10 @@ public class MesDefect extends BaseBean implements Serializable { this.defectType = defectType; this.defectTypeName = defectTypeName; } + + public MesDefect(String defectType, String defectCode, String defectName) { + this.defectType = defectType; + this.defectCode = defectCode; + this.defectName = defectName; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index e7ae500..bd1dd11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -105,7 +105,26 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("缺陷类型名称") private String defectActionTypeName; + @Transient + @ApiParam("缺陷数量") + private Integer defectQty; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } + + public MesDefectRecord() { + + } + + public MesDefectRecord(String partNo, String partName, String workOrderNo, String defectActionType, + String defectCode, String defectName, Integer defectQty) { + this.partNo = partNo; + this.partName = partName; + this.workOrderNo = workOrderNo; + this.defectActionType = defectActionType; + this.defectCode = defectCode; + this.defectName = defectName; + this.defectQty = defectQty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index fcf9501..c77b789 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -5,12 +5,13 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Transient; +import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Map; @Data -public class TJMgnBoardModel extends BaseBean { +public class TJMgnBoardModel extends BaseBean implements Serializable { @ApiParam("工单号") private String workOrderNo; @@ -21,6 +22,12 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("物料名称") private String partNameRdd; + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("条码数量") + private Integer snQty; + @ApiParam("颜色") private String partColor; @@ -74,4 +81,15 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("结束工单") private String workOrderNoEnd; + public TJMgnBoardModel() { + } + + public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qcStatus = qcStatus; + this.workOrderNo = workOrderNo; + this.snQty = snQty; + } + } From fddd66796bace4045c6f1c622b34b19dc52cec7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 12 Nov 2020 17:41:31 +0800 Subject: [PATCH 078/329] =?UTF-8?q?=E3=80=9012276=2020027-PCN=E7=AB=AF=20-?= =?UTF-8?q?=20=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C-=20=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=87=8C=E9=9D=A2=E7=BB=B4=E6=8A=A4=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8E=BB=E7=94=9F=E6=88=90=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20-20201105=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/mes/sqlpack/MesPcnHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index f585b43..a960c29 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -437,6 +437,8 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); } + DdlPreparedPack.getStringLikerPack(mesPackage.getLotNo(), "lotNo", packBean); + // 时间段查询 DdlPreparedPack.timeBuilder( mesPackage.getCreateDateTimeStart(), From 5f6a7c9a98e73bb84f8d37a699507540a75cd54b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 12 Nov 2020 18:42:26 +0800 Subject: [PATCH 079/329] =?UTF-8?q?Fix=20bug#12380=2019048-=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91BOM=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index c276781..a2488f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description 全量BOM @@ -103,4 +104,15 @@ public class WmsBomTotal extends BaseBean { public boolean hasChild() { return category != null && category.trim().equals(MGANA_BOM_HAS_CHILD); } + + /** + * 导入列 + */ + @Transient + @ApiParam(value = "行数") + private Integer rows; + + @Transient + @ApiParam(value = "状态") + private Integer status; } From 86998e109ed4bb174195d7962340204d5c8370b5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 12 Nov 2020 20:38:38 +0800 Subject: [PATCH 080/329] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java index 931906d..4cc7cf7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -42,4 +42,7 @@ public class DismantleRecordModel { @ApiParam("不良集合") private List defectList; + + @ApiParam("返修工位标志") + private String repairFlag; } From 89bf22521a4f93c0ac79cf8383c92ec8931e5004 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 13 Nov 2020 10:11:10 +0800 Subject: [PATCH 081/329] =?UTF-8?q?Fix=20bug#12380=2019048-=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91BOM=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 15 +++++++++++++++ 1 file changed, 15 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 7effd9e..1d731cd 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 @@ -2349,6 +2349,21 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** From 206e5f8d20857f1948fcf983072a32e97b3d2a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 13 Nov 2020 11:00:03 +0800 Subject: [PATCH 082/329] =?UTF-8?q?feat(form):=E6=94=AF=E6=8C=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 6 ++ .../i3plus/pojo/form/bean/BfElementProperty.java | 13 +++++ .../i3plus/pojo/model/mes/ExcelImportModel.java | 19 ++++++- .../i3plus/pojo/model/mes/ImportErrorModel.java | 64 ++++++++++++++++++++++ 4 files changed, 99 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 3dcf892..5eec86d 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -8,6 +8,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -140,6 +141,11 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否导出") private Integer isObjectExport; + @ColumnDefault("2") + @Column(name = "IS_OBJECT_IMPORT") + @ApiParam(value = "是否导入") + private Integer isObjectImport; + @Column(name="ELEMENT_SORT_ATTR_ID") @ApiParam(value ="默认排序属性") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 33d1bef..864ad93 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -87,6 +88,10 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "是否必填") private Integer propertyValueNotNull; + public boolean isPropValNotNull() { + return propertyValueNotNull == null || propertyValueNotNull == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + } + @Column(name = "PROPERTY_IS_FIND") @ApiParam(value = "是否查询条件") private Integer propertyIsFind; @@ -123,6 +128,14 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "显示顺序") private Integer propertySort; + @Column(name = "IS_SUPPORT_IMPORT") + @ApiParam(value = "是否支持导入") + private Integer isSupportImport; + + public boolean isSupportImport() { + return isSupportImport != null && isSupportImport == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + } + @Column(name = "PROPERTY_CONTROL_TYPE") @ApiParam(value = "控件类型") private Integer propertyControlType; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java index a4d0580..d49ea8c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java @@ -5,9 +5,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -16,12 +16,12 @@ import java.util.List; * @Description: **/ @Data -@NoArgsConstructor @AllArgsConstructor @Api("mes导入结果model") public class ExcelImportModel implements Serializable { private static final long serialVersionUID = 3075276018074690913L; + @ApiParam("结果") private boolean result; @@ -32,7 +32,7 @@ public class ExcelImportModel implements Serializable { private int failRowNum; @ApiParam("错误信息集合") - private List ImportErrorModels; + private List importErrorModels; @ApiParam("错误的行号") private String errorRows; @@ -46,4 +46,17 @@ public class ExcelImportModel implements Serializable { @ApiParam("Sheet名称") private String sheetName; + + public ExcelImportModel() { + result = true; + } + + public void addErrorMsg(ImportErrorModel errorModel) { + if (importErrorModels == null) { + importErrorModels = new ArrayList<>(); + } + importErrorModels.add(errorModel); + result = false; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java index c644a49..4a135a5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java @@ -21,9 +21,19 @@ import java.io.Serializable; public class ImportErrorModel implements Serializable { private static final long serialVersionUID = 1212013821950324792L; + + @ApiParam("sheet名称") + private String sheetName; + @ApiParam("错误的行号") private int rowNum; + @ApiParam("错误的列号") + private int colNum; + + @ApiParam("错误的列名") + private String colName; + @ApiParam("错误数量") private int errorNum; @@ -33,4 +43,58 @@ public class ImportErrorModel implements Serializable { @ApiParam("错误描述") private String errorInfo; + public static final class Builder { + private String sheetName; + private int rowNum; + private int colNum; + private String colName; + private String errorInfo; + + private Builder() { + } + + public static Builder newBuilder() { + return new Builder(); + } + + public Builder withSheetName(String sheetName) { + this.sheetName = sheetName; + return this; + } + + public Builder withRowNum(int rowNum) { + this.rowNum = rowNum; + return this; + } + + public Builder withColNum(int colNum) { + this.colNum = colNum; + return this; + } + + public Builder withColName(String colName) { + this.colName = colName; + return this; + } + + public Builder withErrorInfo(String errorInfo) { + this.errorInfo = errorInfo; + return this; + } + + public ImportErrorModel build() { + ImportErrorModel importErrorModel = new ImportErrorModel(); + importErrorModel.setSheetName(sheetName); + importErrorModel.setRowNum(rowNum); + importErrorModel.setColNum(colNum); + importErrorModel.setColName(colName); + if(errorInfo== null){ + importErrorModel.setErrorInfo("SHEET【" + sheetName + "】中第【" + rowNum + "】行，第【" + colNum + "】列 " + + colName + " 数据为空"); + }else { + importErrorModel.setErrorInfo(errorInfo); + } + return importErrorModel; + } + } } From 3af9790a9e54d3c48088aeafe4af3713ef5603ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 13 Nov 2020 13:53:46 +0800 Subject: [PATCH 083/329] =?UTF-8?q?refactor(impp):=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/bean/BaseResultBean.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index 83c5994..b234ae3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.Map; @@ -16,37 +16,37 @@ import java.util.Map; **/ public class BaseResultBean { - @ApiParam("是否成功") + @ApiModelProperty("是否成功") public boolean success; - @ApiParam("信息代码-国际化") + @ApiModelProperty("信息代码-国际化") public String code; - @ApiParam("操作消息") + @ApiModelProperty("操作消息") public String msg; - @ApiParam("错误消息") + @ApiModelProperty("错误消息") public String errorMsg; - @ApiParam("http路径") + @ApiModelProperty("http路径") public String url; - @ApiParam("List结果集") + @ApiModelProperty("List结果集") public List resultList; - @ApiParam("单个结果") + @ApiModelProperty("单个结果") public Obj resultObject; - @ApiParam("翻页和结果集") + @ApiModelProperty("翻页和结果集") public ListPager listPager; - @ApiParam("Map结果集") + @ApiModelProperty("Map结果集") public Map resultMap; - @ApiParam("翻页操作") + @ApiModelProperty("翻页操作") public Pager pager; - @ApiParam("总记录数") + @ApiModelProperty("总记录数") public int totalCount; public boolean isSuccess() { From 5780306e940d65185d162628e33789a5e7d06ae8 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 14:08:39 +0800 Subject: [PATCH 084/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java | 6 +++--- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java index 749e502..81a783f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : MES_容器位置 @@ -26,9 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONTAINER_LOCATION") @Api("MES_容器位置") -public class MesContainerLocation extends BaseBean { - - private static final long serialVersionUID = -1650212958579635634L; +public class MesContainerLocation extends BaseBean implements Serializable { + private static final long serialVersionUID = 8181007288150974903L; @Column(name = "CT_CODE") @ApiParam(value = "容器类型代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java index 9fe9dff..5d11d7c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : MES_客户条码规则 @@ -26,8 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER_SN_RULE") @Api("MES_客户条码规则") -public class MesCustomerSnRule extends BaseBean { - private static final long serialVersionUID = -7455066846136535539L; +public class MesCustomerSnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -3928160156339420471L; @Column(name = "CUSTOMER_CODE") @ApiParam(value = "客户代码") From ea1d51f32c88a0b99e8168b4e675653eacd106a1 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 14:09:43 +0800 Subject: [PATCH 085/329] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/repository/MesProdCtCapacityConfigRepository.java | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java deleted file mode 100644 index 44c6144..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesProdCtCapacityConfig; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : dominic - * @CreateDate : 2020-11-04 - **/ -@Repository -public interface MesProdCtCapacityConfigRepository extends BaseRepository { -} From cea2d334e307034ad7d9cb525100295fd1f64598 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 13 Nov 2020 14:56:35 +0800 Subject: [PATCH 086/329] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=85=AC=E5=B7=AE=E4=B8=8A=E7=BA=BF=E5=92=8C=E5=85=AC=E5=B7=AE?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java | 15 +++++++++------ .../i3plus/pojo/mes/model/MesQualityStandardModel.java | 8 ++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java index 707ff42..88a7573 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -69,11 +70,11 @@ public class MesQualityStandard extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private String isConcession; + private Integer isConcession; @Column(name = "CHECK_INTERVAL") @ApiParam("间隔时间") - private String checkInterval; + private Integer checkInterval = 0; //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 @Column(name = "NUMBER_FLAG") @@ -99,13 +100,15 @@ public class MesQualityStandard extends BaseBean implements Serializable { @ApiParam("检验值类型") private String checkValueType; - @Column(name = "maximum") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公差上限") - private BigDecimal maximum; + private Double maximum = 0d; - @Column(name = "minimum") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公差下限") - private BigDecimal minimum; + private Double minimum = 0d; @Column(name = "IS_KEY_CHECK_ITEM") @ApiParam("是否关键检测项") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java index fc27237..8a023f4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java @@ -45,10 +45,10 @@ public class MesQualityStandardModel { private String checkFrequency; @ApiParam("是否允许让步") - private String isConcession; + private Integer isConcession; @ApiParam("间隔时间") - private String checkInterval; + private Integer checkInterval; //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 @ApiParam("个数标识") @@ -70,10 +70,10 @@ public class MesQualityStandardModel { private String checkValueType; @ApiParam("公差上限") - private BigDecimal maximum; + private Double maximum; @ApiParam("公差下限") - private BigDecimal minimum; + private Double minimum; @ApiParam("是否关键检测项") private Integer isKeyCheckItem; From 84986eb644ad991d179383121e36df024ad91417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 13 Nov 2020 15:51:12 +0800 Subject: [PATCH 087/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index cfcc146..90d847f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -168,4 +168,13 @@ public class IfProductOffLine extends BaseBean implements Serializable { this.workCenterCode = workCenterCode; this.qcStatus = qcStatus; } + + public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double itemQty, String createDatetime) { + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partName = partName; + this.packageNo = packageNo; + this.itemQty = itemQty; + this.createDatetime = createDatetime; + } } From 31a1c64f6950fee0dd455b9505d9405a3f72a34c Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 16:07:03 +0800 Subject: [PATCH 088/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5:?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=BD=8D=E7=BD=AE=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/mes/bean/MesProduceCtgyPicture.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index ba53ce5..b18781d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -39,6 +39,10 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable { @ApiParam("面位") private String sideLocation; + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + @Column(name = "FILE_ID") @ApiParam("文件id") private Long fileId; From 395039e901999381f917af928ff5316fdbb568c6 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 16:08:49 +0800 Subject: [PATCH 089/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=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/pcn/bean/MesDefect.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java index 2214411..bed31e1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -44,6 +44,18 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("缺陷类型") private String defectType; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "DEFECT_FLAG_VALUE") + @ApiParam("缺陷标识值") + private String defectFlagValue; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + @Transient @ApiParam("缺陷类型名称") private String defectTypeName; From de51b68790cfc770ebf22cc2d1cebb126538d9f7 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 16:09:46 +0800 Subject: [PATCH 090/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8:=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=BC=BA=E9=99=B7=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDefectLocation.java | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java new file mode 100644 index 0000000..7bffe76 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java @@ -0,0 +1,39 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\13 09:59 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_LOCATION") +@Api("产品缺陷位置") +public class MesDefectLocation extends BaseBean implements Serializable { + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷位置名称") + private String defectName; +} From c6a3428cbe4967350426a05480ad5386a4cd63c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 13 Nov 2020 17:52:10 +0800 Subject: [PATCH 091/329] =?UTF-8?q?=E3=80=9012420=2019048=20=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E4=BA=8C=E6=A3=80=E5=A2=9E=E5=8A=A0UNPACK=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=2020201112=E3=80=91=2012391=2019048-=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A5=E6=89=93(=E5=8C=85=E8=A3=85)=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=B3=E8=81=94=E6=89=B9=E6=AC=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6-20201112=20=E5=BC=80=E7=BA=BF=E7=AE=A1?= =?UTF-8?q?=E6=8E=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index a960c29..37bdaec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -437,7 +437,7 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); } - DdlPreparedPack.getStringLikerPack(mesPackage.getLotNo(), "lotNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean); // 时间段查询 DdlPreparedPack.timeBuilder( From 058bd05b4ac8142ff76d3e055f2b4e1b3c91bd20 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 13 Nov 2020 22:28:39 +0800 Subject: [PATCH 092/329] =?UTF-8?q?mgn-bj=20esop=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 2 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 3 +- .../pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 4 +++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index bc61bd2..a8890ef 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -75,7 +75,7 @@ public class AndonBoardModel implements Serializable { private String color; @ApiParam("停线时间比率") - private Integer downtimeRate; + private String downtimeRate; public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; 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 28db666..fc5f9a9 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 @@ -6028,4 +6028,39 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIS_BACKFLUSH_STATUS { + BACKFLUSH("BACKFLUSH", "正常回冲扣减"), + REPAIR("REPAIR", "返修冲料"); + + private String value; + private String description; + + JIS_BACKFLUSH_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 9f15432..e79dec4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -356,9 +356,10 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, + public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, String partNo, String prodCfgTypeCode) { this.id = id; + this.orderNo = orderNo; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; this.vinCode = vinCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index c1994c1..ebc4348 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -41,6 +41,10 @@ public class MgnBjBoardModel implements Serializable { private Integer onceQualityRate = 0; @ApiParam("待生产订单数量") private Integer waitProduceQty = 0; + @ApiParam("低于安全库存") + private Integer minStockQty; + @ApiParam("超出最大库存") + private Integer maxStockQty; @ApiParam(value = "显示颜色") private String color; From e3e4e1fc841e863b842367798442f3b69bbb6c5c Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 14 Nov 2020 18:39:38 +0800 Subject: [PATCH 093/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 94e14e5..37d66bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -362,4 +362,14 @@ public class WmsPart extends BaseBean { this.snp = snp; this.partSpec = partSpec; } + + public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) { + this.partNo = partNo; + this.partName = partName; + this.partSpec = partSpec; + this.snp = snp; + this.buyUnit = buyUnit; + this.snControl = snControl; + this.qty = qty; + } } From fa01ec478addd530d24b45cc4558bf243ea59797 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 16 Nov 2020 10:25:34 +0800 Subject: [PATCH 094/329] =?UTF-8?q?Mes=5FPackage=20=E8=A1=A8=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 77d9324..770fcc1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -23,7 +23,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +@Table(name = "MES_PACKAGE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "WORK_ORDER_NO"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "IS_SEALED") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) }) From cbd0b1f1361396249c70506c511e738bfbabb50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Nov 2020 14:44:42 +0800 Subject: [PATCH 095/329] BUG#12496 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index fd5b258..bcfd661 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -65,7 +65,7 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_PARAM") private String scriptParam; - @ApiParam("附件文件路径获取脚本编号") + @ApiParam("附件脚本编号") @Column(name = "ATTACH_SCRIPT_NO") private String attachScriptNo; From 4c1add6ba4d074352bc091da250b6c9e15aa7dfc Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 16 Nov 2020 14:56:33 +0800 Subject: [PATCH 096/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.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/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 28db666..458a3cf 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 @@ -3864,7 +3864,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROCESS_INSPECTION { NOT_CREATE(10, "未创建"), - CREATE(20, "创建"), + CREATE(20, "已创建"), PROCESS(30, "执行中"), COMPLETE(40, "完成"); From 4300201f99318ca4f13d9680430ed3c160d6943f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Nov 2020 15:48:44 +0800 Subject: [PATCH 097/329] BUG#12430,12495 --- .../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 4005ae5..89f6ed4 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 @@ -324,11 +324,13 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, + public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; this.erpSrcNo = erpSrcNo; + this.item = item; this.partNo = partNo; + this.partNameRdd = partNameRdd; this.qty = qty; this.rcQty = rcQty; this.itemStatus = itemStatus; From 928c643031604d978ca813ae1b6cd8793cd91de0 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 16 Nov 2020 16:37:50 +0800 Subject: [PATCH 098/329] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index dac64cf..10d429d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3540,4 +3540,24 @@ public class MesHqlPack { } return packBean; } + + /** + * MES_看板自定义参数配置查询条件封装 + * + * @param boardCustomParamCfg + * @return + */ + public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) { + DdlPackBean packBean = getAllBaseDataByNormalPro(boardCustomParamCfg, boardCustomParamCfg.getOrganizeCode()); + if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(boardCustomParamCfg.getParamCode())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamCode(), "paramCode", packBean); + } + if (!StringUtils.isEmpty(boardCustomParamCfg.getParamName())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamName(), "paramName", packBean); + } + return packBean; + } } From dc3e344f1159a86d2a35570dc17dffdbb67253d4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 17 Nov 2020 15:57:26 +0800 Subject: [PATCH 099/329] =?UTF-8?q?Fix=20bug#12401=2019048-=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=94=AF=E6=8C=81=E5=85=B3=E8=81=94=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA470=E5=8D=95=E6=8D=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 3dec39f..cb532b0 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 @@ -696,10 +696,23 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } - public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode) { + public WmsDocMovementDetails(String orderNo, String prodCfgTypeCode, String prodCfgTypeName, + Double qty, String planDate, String planTime, String custNo) { + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + } + + + public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode, String custNo) { this.orderNo = orderNo; this.pickQty = pickQty; this.prodCfgTypeCode = prodCfgTypeCode; + this.custNo = custNo; } } From e9ec997e056dd67ef7729b3d23fa6e78549c5ebd Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 17 Nov 2020 16:19:16 +0800 Subject: [PATCH 100/329] =?UTF-8?q?Fix=20Bug=20#12413=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81=E9=94=99=E8=AF=AF?= 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, 1 insertion(+), 1 deletion(-) 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 0cd559a..b1a0ad4 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 @@ -1752,7 +1752,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result); + //DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); /*DdlPreparedPack.getOrderByPack( From 8d0e2b942b6a5f1e12780786e7b77ad6951f34ac Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 16:54:47 +0800 Subject: [PATCH 101/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=9A=E5=8A=A1pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 6 +- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPackage | 81 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesContainerLocation | 44 ++++++++++++ .../i3plus/pojo/mes/bean/MesCustomerSnRule.java | 60 ++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 5 ++ .../i3plus/pojo/mes/bean/MesDefectLocation.java | 39 +++++++++++ .../i3plus/pojo/mes/bean/MesPackageTravel.java | 4 ++ .../pojo/mes/bean/MesPartContainerCapacity.java | 48 +++++++++++++ .../pojo/mes/bean/MesProduceCtgyPicture.java | 4 ++ .../repository/MesContainerLocationRepository.java | 16 +++++ .../repository/MesCustomerSnRuleRepository.java | 16 +++++ .../MesPartContainerCapacityRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 65 +++++++++++++++++ 13 files changed, 403 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 863a6fd..1023d06 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -25,7 +25,7 @@ import java.io.Serializable; @Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) - } +} ) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { @@ -35,6 +35,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage new file mode 100644 index 0000000..ec64f3a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage @@ -0,0 +1,81 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020/10/29 14:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE") +@Api("料箱表") +public class IfPackage extends BaseBean implements Serializable { + + private static final long serialVersionUID = 9099416791684702129L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; + + @Column(name = "PORCESS_NAME") + @ApiParam("工序名称") + private String porcessName; + + @Column(name = "RK_TYPE") + @ApiParam("料架类型") + private String rkType; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation new file mode 100644 index 0000000..89a8a11 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation @@ -0,0 +1,44 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_容器位置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 17:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER_LOCATION") +@Api("MES_容器位置") +public class MesContainerLocation extends BaseBean implements Serializable { + private static final long serialVersionUID = 8181007288150974903L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "LOCATION_CAPACITY") + @ApiParam(value = "默认容量") + private String locationCapacity; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java new file mode 100644 index 0000000..5d11d7c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java @@ -0,0 +1,60 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_客户条码规则 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER_SN_RULE") +@Api("MES_客户条码规则") +public class MesCustomerSnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -3928160156339420471L; + + @Column(name = "CUSTOMER_CODE") + @ApiParam(value = "客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam(value = "客户零件号") + private String customerPartNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + private String partNo; + + @Column(name = "LENGTH") + @ApiParam(value = "长度") + private Integer length; + + @Column(name = "FROM1") + @ApiParam(value = "起始1") + private Integer from1; + + @Column(name = "TO1") + @ApiParam(value = "至1") + private Integer to1; + + @Column(name = "FIX1") + @ApiParam(value = "内容1") + private String fix1; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index d5e92b6..fb61ecb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("项目代码") private String prodCfgTypeCode; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + @Column(name = "DEFECT_FLAG_VALUE") @ApiParam("缺陷标识值") private String defectFlagValue; @@ -67,6 +71,7 @@ public class MesDefect extends BaseBean implements Serializable { @Transient @ApiParam("缺陷类型子集") private List mesDefectList; + public MesDefect() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java new file mode 100644 index 0000000..7bffe76 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java @@ -0,0 +1,39 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\13 09:59 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_LOCATION") +@Api("产品缺陷位置") +public class MesDefectLocation extends BaseBean implements Serializable { + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷位置名称") + private String defectName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 1b9e494..f8e410d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -34,6 +34,10 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java new file mode 100644 index 0000000..6b864cf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java @@ -0,0 +1,48 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : MES_产品容器容量配置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_CONTAINER_CAPACITY") +@Api("MES_产品容器容量配置") +public class MesPartContainerCapacity extends BaseBean { + + private static final long serialVersionUID = 6438819635320965628L; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "CT_QTY") + @ApiParam(value = "容量") + private Integer ctQty; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index ba53ce5..b18781d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -39,6 +39,10 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable { @ApiParam("面位") private String sideLocation; + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + @Column(name = "FILE_ID") @ApiParam("文件id") private Long fileId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java new file mode 100644 index 0000000..1118c74 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesContainerLocation; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesContainerLocationRepository extends BaseRepository { +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java new file mode 100644 index 0000000..379d160 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerSnRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesCustomerSnRuleRepository extends BaseRepository { +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java new file mode 100644 index 0000000..3d65339 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartContainerCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesPartContainerCapacityRepository extends BaseRepository { +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 10d429d..abe8e5e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -730,6 +730,7 @@ public class MesHqlPack { /** * 产线看板矩阵 + * * @param boardLineMatrix * @param organizeCode * @return @@ -3560,4 +3561,68 @@ public class MesHqlPack { } return packBean; } + + + /** + * MES容器位置查询条件封装 + * + * @param mesContainerLocation + * @return + */ + public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode()); + if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES产品容器容量配置查询条件封装 + * + * @param mesPartContainerCapacity + * @return + */ + public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES客户条码规则查询条件封装 + * + * @param mesCustomerSnRule + * @return + */ + public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode()); + if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean); + } + return packBean; + } } From eb7ed898df75cdb7e6533356b297d24f80d1a0c6 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:10:26 +0800 Subject: [PATCH 102/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=9A=E5=8A=A1pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation index 89a8a11..0c12f1d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONTAINER_LOCATION") -@Api("MES_容器位置") +@Api("MES_容器位置") public class MesContainerLocation extends BaseBean implements Serializable { private static final long serialVersionUID = 8181007288150974903L; From f1fedb53f4a8be438cbb020bb575c03b88a65d71 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:14:13 +0800 Subject: [PATCH 103/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=9A=E5=8A=A1pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/{MesContainerLocation => MesContainerLocation.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesContainerLocation => MesContainerLocation.java} (97%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java similarity index 97% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java index 0c12f1d..89a8a11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONTAINER_LOCATION") -@Api("MES_容器位置") +@Api("MES_容器位置") public class MesContainerLocation extends BaseBean implements Serializable { private static final long serialVersionUID = 8181007288150974903L; From 785e8dbfe888296fd6a91a5691e54a16796c466d Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:32:21 +0800 Subject: [PATCH 104/329] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java index 7fd2655..bd948bd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java @@ -2,8 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; /** * @Author: Wynne.Lu From 61638c391a5300f2b3600248f213a37a723179f0 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:33:57 +0800 Subject: [PATCH 105/329] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=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/MesPackageDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 16cf9c5..8315005 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -34,6 +34,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; From d8c52a0534cddd0417e541cabe4783a50f75f7cc Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:45:21 +0800 Subject: [PATCH 106/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java index bd948bd..6d2fe27 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; /** * @Author: Wynne.Lu From 13bd15d99770ad5c6b4c269dac82e19a07130477 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 18:16:01 +0800 Subject: [PATCH 107/329] =?UTF-8?q?=E5=9B=9E=E6=BB=9APCN=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 1023d06..a987364 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -35,10 +35,6 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; - @Column(name = "CT_LOCATION_NO") - @ApiParam("容器位置编号") - private String ctLocationNo; - @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; From 452024abf6bba168c286962f1a6cf03d85d7a005 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 18:19:05 +0800 Subject: [PATCH 108/329] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 82 ---------------------- 1 file changed, 82 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java deleted file mode 100644 index 9ef4f8c..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ /dev/null @@ -1,82 +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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: dominic - * @CreateDate: 2020/10/29 14:11 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PACKAGE") -@Api("料箱表") -public class IfPackage extends BaseBean implements Serializable { - - private static final long serialVersionUID = 9099416791684702129L; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装编号") - private String packageNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam("数量") - private Double qty; - - @Column(name = "PORCESS_NAME") - @ApiParam("工序名称") - private String porcessName; - - @Column(name = "RK_TYPE") - @ApiParam("料架类型") - private String rkType; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - @Lob - private String errorMessage; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - -} From 22a88a4dc0d144fd90bb1ca5bd1789699dfe3767 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 18:38:44 +0800 Subject: [PATCH 109/329] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=AD=A5=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage index ec64f3a..5583de7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage @@ -77,5 +77,4 @@ public class IfPackage extends BaseBean implements Serializable { @Column(name = "SYNC_STATUS") @ApiParam("同步状态") private Integer syncStatus; - } \ No newline at end of file From d8409c5b573d82c00086a789384584639c2e70f6 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 17 Nov 2020 18:57:14 +0800 Subject: [PATCH 110/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java new file mode 100644 index 0000000..5583de7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -0,0 +1,80 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020/10/29 14:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE") +@Api("料箱表") +public class IfPackage extends BaseBean implements Serializable { + + private static final long serialVersionUID = 9099416791684702129L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; + + @Column(name = "PORCESS_NAME") + @ApiParam("工序名称") + private String porcessName; + + @Column(name = "RK_TYPE") + @ApiParam("料架类型") + private String rkType; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; +} \ No newline at end of file From 42feb06058c298badc01b4742c47647a5e1d1b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=8F=8C=E5=8F=8C?= Date: Tue, 17 Nov 2020 19:03:07 +0800 Subject: [PATCH 111/329] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'modules/i3plus-po?= =?UTF-8?q?jo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPackage | 80 ---------------------- 1 file changed, 80 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage deleted file mode 100644 index 5583de7..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage +++ /dev/null @@ -1,80 +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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: dominic - * @CreateDate: 2020/10/29 14:11 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PACKAGE") -@Api("料箱表") -public class IfPackage extends BaseBean implements Serializable { - - private static final long serialVersionUID = 9099416791684702129L; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装编号") - private String packageNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam("数量") - private Double qty; - - @Column(name = "PORCESS_NAME") - @ApiParam("工序名称") - private String porcessName; - - @Column(name = "RK_TYPE") - @ApiParam("料架类型") - private String rkType; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} \ No newline at end of file From 1f306924e4489b33ad3a69899325a372935ad2e4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 17 Nov 2020 19:32:34 +0800 Subject: [PATCH 112/329] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8F=82=E6=95=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index abe8e5e..c5921cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3549,7 +3549,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) { - DdlPackBean packBean = getAllBaseDataByNormalPro(boardCustomParamCfg, boardCustomParamCfg.getOrganizeCode()); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardCustomParamCfg.getOrganizeCode()); if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) { DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean); } From 156b515497d0872ae0406229861cc54fa59526df Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 18 Nov 2020 09:26:22 +0800 Subject: [PATCH 113/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSWEB=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 106 ++++++++++----------- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 6 +- 2 files changed, 58 insertions(+), 54 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 2184f9a..a130b9b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -136,6 +136,59 @@ public class SwebEnumUtil { } /** + * 单据条码状态（PO/DOC_MOVE） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_SN_STATUS { + CREATE(10, "N", "创建"), + RECEIPTED(20, "R", "已完成"), + CANCEL(30, "C", "行取消"), + PRINTED(40, "C", "已打印"); + + private int value; + private String code; + private String description; + + ORDER_SN_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * PO订单来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -706,59 +759,6 @@ public class SwebEnumUtil { } /** - * 单据条码状态（PO/DOC_MOVE） - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_SN_STATUS { - CREATE(10, "N", "创建"), - RECEIPTED(20, "R", "已完成"), - CANCEL(30, "C", "行取消"), - PRINTED(40, "C", "已打印"); - - private int value; - private String code; - private String description; - - ORDER_SN_STATUS(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getCode() { - return code; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 条码类型 10=实物条码，20=虚拟条码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 3466256..0b95c97 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -59,6 +59,10 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "UNIT") private String unit; + @Column(name = "SN_STATUS") + @ApiParam(value = "SN状态", example = "1") + private Integer snStatus; + @Column(name = "BOX_QTY") @ColumnDefault("0") @ApiParam(value = "箱数", example = "0") @@ -66,7 +70,7 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "SERIAL_NO") @ApiParam(value = "序列号") - private String serialNo; + private Integer serialNo; @Column(name = "SN") @ApiParam(value = "箱条码") From fdec58c92a58085649fe6c9d31869a9690b38a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 18 Nov 2020 10:42:53 +0800 Subject: [PATCH 114/329] =?UTF-8?q?feat(form):=E8=A1=A8=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/form/bean/BfDataObjectProperty.java | 4 +++ .../pojo/model/form/BfCheckOnlyResultModel.java | 31 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 7d5ab65..e919715 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -79,6 +79,10 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="是否主键") private Integer isPrimaryKey; + public boolean isPrimaryKey(){ + return isPrimaryKey != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isPrimaryKey); + } + @Column(name="IS_NULLABLE") @ApiParam(value = "是否允许为空") private Integer isNullable; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java new file mode 100644 index 0000000..ab2cd47 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfCheckOnlyResultModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.base.dynamic.DynamicEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-11-17 16:32 + * @Modify: + **/ +@Data +@ApiModel("检查唯一返回结果model") +public class BfCheckOnlyResultModel { + + @ApiModelProperty("是否唯一") + private boolean isOnly; + + @ApiModelProperty("重复的数据") + private DynamicEntity repeatData; + + @ApiModelProperty("异常信息") + private Exception exception; + + public BfCheckOnlyResultModel() { + this.isOnly = true; + } +} From faad8cf4c858ca119011acab52904602e8ee0c09 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 18 Nov 2020 11:38:07 +0800 Subject: [PATCH 115/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=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/MesPackageDetail.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/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 811165e..8315005 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -34,7 +34,7 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; - @Column(name = "CT_LOCATION_NO", nullable = false) + @Column(name = "CT_LOCATION_NO") @ApiParam("容器位置编号") private String ctLocationNo; From b7e2ddd2c26227cfab8b5be729204cafb3260dd1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 18 Nov 2020 15:54:03 +0800 Subject: [PATCH 116/329] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=98=8E=E7=BB=86=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 8315005..ca64a64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -22,7 +22,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +@Table(name = "MES_PACKAGE_DETAIL", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PART_NO"), + @Index(columnList = "PACKAGE_NO2") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) }) From cc947c08f5e2dc0f25a2260ef942c4e052fbd698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 18 Nov 2020 16:38:06 +0800 Subject: [PATCH 117/329] =?UTF-8?q?revert(pojo):=E8=BF=98=E5=8E=9Fpom?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From f2180f18f38813514d033ed5f267df27bd8eadac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 18 Nov 2020 16:44:16 +0800 Subject: [PATCH 118/329] =?UTF-8?q?revert(pojo):=E8=BF=98=E5=8E=9Fpom?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 22411fa92880c6c1a2164c4a52b8db85d35797d6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 18 Nov 2020 18:03:28 +0800 Subject: [PATCH 119/329] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 50 +++++++++++++++++++++- .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 4 ++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 12 +++++- .../model/excel/mgnbj/SparePartsImportModel.java | 3 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 ++ 6 files changed, 74 insertions(+), 2 deletions(-) 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 4d2d890..98ad82a 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 @@ -7899,7 +7899,6 @@ public class MesEnumUtil { } - /** * 物料 物料类型1 */ @@ -8095,4 +8094,53 @@ public class MesEnumUtil { } } + /** + * 展示供应商代码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_SUPPLIER_CODE { + MGN(10, "麦格纳"), + OTHER(20, "其他"), + ALL(99, "全部"); + + private int value; + private String description; + + SHOW_SUPPLIER_CODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static MesEnumUtil.SHOW_SUPPLIER_CODE getByValue(Integer value) { + for (MesEnumUtil.SHOW_SUPPLIER_CODE showSupplierCode : values()) { + if (showSupplierCode.getValue() == value) { + return showSupplierCode; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index ad5c91b..e2807df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -145,6 +145,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("通知标识") private Integer noticeSign = 10; + @Column(name = "REPLACE_VIN_CODE") + @ApiParam("替换vin") + private String replaceVinCode; + @Transient @ApiParam("创建时间") private String cdtTruncated; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index 04d6155..004377f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -118,4 +118,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Transient @ApiParam("计划上线结束时间") private String planEndDate; + + @Transient + @ApiParam("替换vin") + private String replaceVinCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 8524845..6f6b2bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -176,6 +176,14 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("结束时间") private String endTime; + @Transient + @ApiParam("数量") + private Double qty; + + @Transient + @ApiParam("已生产数量") + private Double finsihQty; + public MesQueueOrder(){} public int getStatusVal() { @@ -205,7 +213,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, - String workCenterCode, String workCellCode) { + String workCenterCode, String workCellCode, Double qty, Double finsihQty) { this.id = id; this.seq = seq; this.partNo = partNo; @@ -221,6 +229,8 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.orderNo = orderNo; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; + this.qty = qty; + this.finsihQty = finsihQty; } } 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 eaecea7..970d9b0 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 @@ -52,6 +52,9 @@ public class SparePartsImportModel { @ApiParam("客户零件号") private String custPartNo; + @ApiParam("替换VIN") + private String replaceVinCode; + @ApiParam("用量") private Integer qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index c5921cb..6072133 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2489,6 +2489,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean); } + if (!StringUtils.isEmpty(queueJitActual.getReplaceVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getReplaceVinCode(), "replaceVinCode", packBean); + } if (queueJitActual.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); } From 8e5c2f4b00c8e43fd506dfec69875823b6f8a648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 18 Nov 2020 18:31:56 +0800 Subject: [PATCH 120/329] BUG#12170,12417,12166,12437,12452 --- .../estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index b327dc3..d2bd144 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -35,6 +35,9 @@ public class WmsVendorDelayMasterModel extends BaseBean { @ApiParam(value = "延迟次数") private Long sumDelayCount; + @ApiParam(value = "延迟到货百分比") + private Double delayPercent; + @ApiParam(value = "查询开始时间") private String startDateTime; @@ -62,7 +65,8 @@ public class WmsVendorDelayMasterModel extends BaseBean { this.createDatetime = createDateTime; } - public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) { + public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, + String actualPlanTime, String vendorNo, String vendorName, String organizeCode) { this.orderNo = orderNo; this.reason = reason; this.planDate = planDate; From 2de0d76af3e7b6ae26514d19733d558b7e6f79d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 18 Nov 2020 21:55:38 +0800 Subject: [PATCH 121/329] =?UTF-8?q?=E3=80=902958=2011=202.5.3=20=E7=83=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8A=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesFurnaceLocation.java | 53 ++++++++++++++++++++++ .../pojo/mes/bean/MesFurnaceLocationDetail.java | 52 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++ .../i3plus/pojo/mes/bean/MesPackageTravel.java | 18 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesPartFurnace.java | 40 ++++++++++++++++ .../MesFurnaceLocationDetailRepository.java | 14 ++++++ .../repository/MesFurnaceLocationRepository.java | 14 ++++++ .../mes/repository/MesPartFurnaceRepository.java | 14 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++ 9 files changed, 217 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java new file mode 100644 index 0000000..c42ce77 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -0,0 +1,53 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FURNACE_LOCATION") +@Api("MES_炉内模式位置信息") +public class MesFurnaceLocation extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404126L; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "MODEL_IMG_URL") + @ApiParam("模式图片路径") + private String modelImgUrl; + + @Column(name = "SEQ") + @ApiParam("推荐顺序") + private Integer seq; + + @Transient + @ApiParam("容器编号") + private String ctNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java new file mode 100644 index 0000000..15e8fb0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java @@ -0,0 +1,52 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FURNACE_LOCATION_DETAIL") +@Api("MES_炉内占位信息") +public class MesFurnaceLocationDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818212133126L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 770fcc1..fc5e470 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -153,6 +153,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("erp工作中心") private String erpWorkCenterCode; + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + @Transient @ApiParam("目标库位代码") private String destLocationCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 1b9e494..8222fb8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -54,5 +54,23 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码4") private String packageNo4; + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java new file mode 100644 index 0000000..8ba6f09 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java @@ -0,0 +1,40 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_FURNACE") +@Api("MES_物料上炉模式") +public class MesPartFurnace extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404111L; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java new file mode 100644 index 0000000..777a721 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocationDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesFurnaceLocationDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java new file mode 100644 index 0000000..e2b36dd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocation; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesFurnaceLocationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java new file mode 100644 index 0000000..c81d1dd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartFurnace; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesPartFurnaceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 10d429d..91f381f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3560,4 +3560,12 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) { + DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean); + DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean); + DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean); + return packBean; + } } From 88376bb350eb77e3c0a849582e8c61923f9a9c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 18 Nov 2020 22:01:01 +0800 Subject: [PATCH 122/329] =?UTF-8?q?=E3=80=902958=2011=202.5.3=20=E7=83=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8A=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 95a12d9..bb8bf78 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 @@ -2559,7 +2559,8 @@ public class MesPcnEnumUtil { public enum PACKAGE_OP_TYPE { PACK(10, "打包"), - UNPACK(20, "拆包"); + UNPACK(20, "拆包"), + STOP_OVER(30, "过站"); private int value; private String description; From 92b395ad3fbb4abd13a34938fd1932731c73cafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 18 Nov 2020 22:07:17 +0800 Subject: [PATCH 123/329] =?UTF-8?q?=E3=80=902958=2011=202.5.3=20=E7=83=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8A=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/mes/bean/MesPackageTravel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index d85bae8..83ae8a0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -73,8 +73,4 @@ public class MesPackageTravel extends BaseBean implements Serializable { @Column(name = "FN_LOCATION_NO") @ApiParam("炉内位置代码") private String fnLocationNo; - - @Column(name = "CT_LOCATION_NO") - @ApiParam("容器位置编号") - private String ctLocationNo; } From 359e085aac2fbe5ead234afb6d6db3679818748c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Nov 2020 09:29:03 +0800 Subject: [PATCH 124/329] BUG#12430 --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 89f6ed4..e34f49c 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 @@ -324,10 +324,10 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, + public WmsPOMasterDetails(String orderNo, String remark, Integer item,String partNo,String partNameRdd, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; - this.erpSrcNo = erpSrcNo; + this.remark = remark; this.item = item; this.partNo = partNo; this.partNameRdd = partNameRdd; From a0776b74012edf1b3ef455e684f2f11f7d9909be Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 19 Nov 2020 10:23:34 +0800 Subject: [PATCH 125/329] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6,=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/PackageDetailModel.java | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java new file mode 100644 index 0000000..72c28e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @author dominic + * @date 2020/11/18 21:52 + * @desc 包装明细 + */ +@Data +@Api("包装明细") +public class PackageDetailModel { + + @ApiParam("料架号") + private String ctNo; + + @ApiParam("容器位置编号") + private String ctLocationNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料编号") + private String partNo; + + public PackageDetailModel(String ctNo, String ctLocationNo, String serialNumber, String partNo) { + this.ctNo = ctNo; + this.ctLocationNo = ctLocationNo; + this.serialNumber = serialNumber; + this.partNo = partNo; + } + + public PackageDetailModel() { + } + + ; +} From 183d976c38db866737bd14128e7c60435051acaf Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 19 Nov 2020 11:38:23 +0800 Subject: [PATCH 126/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/PackageDetailModel.java | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java new file mode 100644 index 0000000..5566a60 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @author dominic + * @date 2020/11/19 00:47 + * @desc 包装明细 + */ +@Data +@Api("包装明细") +public class PackageDetailModel { + + public PackageDetailModel(String ctNo, String ctLocationNo, String serialNumber, String partNo) { + this.ctNo = ctNo; + this.ctLocationNo = ctLocationNo; + this.serialNumber = serialNumber; + this.partNo = partNo; + } + + public PackageDetailModel() { + } + + ; + + @ApiParam("料架号") + private String ctNo; + + @ApiParam("容器位置编号") + private String ctLocationNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料编号") + private String partNo; + +} From 0f5ab7b14458025751fca9aa485d1b6ce320fec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Nov 2020 14:06:09 +0800 Subject: [PATCH 127/329] BUG#12609 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 344757d..85012a9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -75,4 +75,8 @@ public class BasCustomer extends BaseBean { @ApiParam(value = "安全库存") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Double safetyStock; + + public double getSafetyStockVal() { + return this.safetyStock == null ? 0.0d : this.safetyStock; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 3c9b438..ffde294 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -110,7 +110,8 @@ public class WmsQCDetails extends BaseBean { Double qty, String unit, String orderNo, Integer itemStatus, String remark, Double factQty, Double passQty, Double rejectQty, - Integer orderStatus, String vendorNo, String vendorDesc) { + Integer orderStatus, String vendorNo, String vendorDesc, + String createUser, String createDatetime,String modifyUser,String modifyDatetime) { this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -126,6 +127,10 @@ public class WmsQCDetails extends BaseBean { this.orderStatus = orderStatus; this.vendorNo = vendorNo; this.vendorDesc = vendorDesc; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; } public WmsQCDetails(String partNo, String partNameRdd, String item, From d3bcf1499e3e0685f79a974e511ad7d5b56ba8da Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 19 Nov 2020 14:10:21 +0800 Subject: [PATCH 128/329] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.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/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 83ae8a0..42cc4d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -34,7 +34,7 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; - @Column(name = "CT_LOCATION_NO", nullable = false) + @Column(name = "CT_LOCATION_NO") @ApiParam("容器位置编号") private String ctLocationNo; From 445f6b309cb0dd203debb5e21c4635174a23069f Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 19 Nov 2020 17:04:17 +0800 Subject: [PATCH 129/329] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E6=B6=88=E8=80=97?= =?UTF-8?q?=E6=9B=BF=E4=BB=A3=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 4 ++-- .../i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index e2807df..2ee9a19 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -145,9 +145,9 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("通知标识") private Integer noticeSign = 10; - @Column(name = "REPLACE_VIN_CODE") + @Column(name = "RELATION_VIN_CODE") @ApiParam("替换vin") - private String replaceVinCode; + private String relationVinCode; @Transient @ApiParam("创建时间") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index 004377f..03b4987 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -121,5 +121,5 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Transient @ApiParam("替换vin") - private String replaceVinCode; + private String relationVinCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index e79dec4..cd14cd7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -356,14 +356,14 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, + public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String jisActualNo, String produceCategoryCode, String workType, String partNo, String prodCfgTypeCode) { this.id = id; this.orderNo = orderNo; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; this.vinCode = vinCode; - this.organizeCode = organizeCode; + this.jisActualNo = jisActualNo; this.produceCategoryCode = produceCategoryCode; this.workType = workType; this.partNo = partNo; 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 970d9b0..5d33515 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 @@ -53,7 +53,7 @@ public class SparePartsImportModel { private String custPartNo; @ApiParam("替换VIN") - private String replaceVinCode; + private String relationVinCode; @ApiParam("用量") private Integer qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index ebc4348..e803e6c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -22,11 +22,11 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("jsa数量") private Integer jsaRate; @ApiParam("完成数量") - private Integer completeQty; + private Integer completeQty = 0; @ApiParam("完成率") private Integer completeRate; @ApiParam("总数量") - private Integer totalQty; + private Integer totalQty = 0; @ApiParam("预警数量") private Integer warnQty; @ApiParam("预警率") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 2064ad7..c3d0ad2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2489,8 +2489,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean); } - if (!StringUtils.isEmpty(queueJitActual.getReplaceVinCode())) { - DdlPreparedPack.getStringLikerPack(queueJitActual.getReplaceVinCode(), "replaceVinCode", packBean); + if (!StringUtils.isEmpty(queueJitActual.getRelationVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "replaceVinCode", packBean); } if (queueJitActual.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); From e21e49ae93bc1afffe1024180460c7302db73bab Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 19 Nov 2020 17:45:26 +0800 Subject: [PATCH 130/329] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=95=E7=A4=BA=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/MesPart.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 1b131b8..ef5c338 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -162,4 +162,8 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("BOM用量") private Double bomQty = 0d; + + @Transient + @ApiParam("客户零件号") + private String custPartNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 6d2a731..3af7858 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -159,6 +159,10 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("校验内容") private String checkContent; + @Transient + @ApiParam("客户零件号") + private String custPartNo; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From e2d6b573f0bbaebaa8cb11d4fa7da30b1bcbe981 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 Nov 2020 17:57:06 +0800 Subject: [PATCH 131/329] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=20=E6=8A=A5=E5=B7=A5=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfProductOffLine.java | 4 +- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 3 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 43 +++++++++++----------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 90d847f..ea3844d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -169,12 +169,12 @@ public class IfProductOffLine extends BaseBean implements Serializable { this.qcStatus = qcStatus; } - public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double itemQty, String createDatetime) { + public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime) { this.workCenterCode = workCenterCode; this.partNo = partNo; this.partName = partName; this.packageNo = packageNo; - this.itemQty = itemQty; + this.qty = qty; this.createDatetime = createDatetime; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index bd1dd11..ef9dddb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -109,6 +109,9 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("缺陷数量") private Integer defectQty; + @ApiParam("维修状态名称") + private String repairStatusName; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index c3d0ad2..2ac90c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2194,39 +2194,40 @@ public class MesHqlPack { } /** - * 维修记录 + * 不良记录 * - * @param mesRepairRecord + * @param defectRecord * @param organizeCode * @return */ - public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode); - if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) { - DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean); + public static DdlPackBean getMesDefectRecord(MesDefectRecord defectRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(defectRecord, organizeCode); + if (!StringUtils.isEmpty(defectRecord.getPartNo())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) { - DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean); + if (!StringUtils.isEmpty(defectRecord.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(defectRecord.getSerialNumber(), "serialNumber", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCenterCode(), "workCenterCode", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getWorkCellCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCellCode(), "workCellCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getDefectCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDefectCode(), "defectCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getDefectCode())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getDefectCode(), "defectCode", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getRepairCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getRepairCode(), "repairCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) { + DdlPreparedPack.getStringLikerPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean); + if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) { + DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean); } - if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) { + + if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( - mesRepairRecord.getCreateDateTimeStart(), - mesRepairRecord.getCreateDateTimeEnd(), + defectRecord.getCreateDateTimeStart(), + defectRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true); } return packBean; From e250883f22891aba04880f02171cc631dadef94b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 20 Nov 2020 03:58:33 +0800 Subject: [PATCH 132/329] =?UTF-8?q?Fix=20bug#12004=2019058-KT=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=87=BA=E5=BA=93=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index b0ac2ab..8095d5e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -86,8 +86,6 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "工单码") private String workOrderCode; - @Column(name = "SEQ_NO") - @ApiParam(value = "父位置号") private String seqNo; @Column(name = "SN_TYPE") @@ -95,13 +93,15 @@ public class WmsDocMovementSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") private Integer snType; + @Column(name = "DEST_LOCATE_NO") + @ApiParam(value = "目标库位代码") + public String destLocateNo; + + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; - @Transient - @ApiParam("目标库位代码") - public String destLocateNo; @Transient @ApiParam("源库位代码") From 148ef03e78f7ceef5b256512d9ee13987d0263ab Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 20 Nov 2020 11:18:15 +0800 Subject: [PATCH 133/329] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=83=BD=E5=8A=9B=E7=9F=A9=E9=98=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 2ac90c6..b30a7dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3637,4 +3637,28 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean); return packBean; } + + /** + * MES_看板自定义参数配置查询条件封装 + * + * @param boardLineStaffMatrix + * @return + */ + public static DdlPackBean getBoardLineStaffMatrix(MesBoardLineStaffMatrix boardLineStaffMatrix) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardLineStaffMatrix.getOrganizeCode()); + if (!StringUtils.isEmpty(boardLineStaffMatrix.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCellCode())) { + DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(boardLineStaffMatrix.getUserCode())) { + DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getUserCode(), "userCode", packBean); + } + return packBean; + } + } From 7a33df666b37f3d75a62e6ef286060ed9e1bb722 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 20 Nov 2020 14:52:00 +0800 Subject: [PATCH 134/329] =?UTF-8?q?JSA=20JSP=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 12 +++++++----- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 8 +++++++- .../estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java | 12 +++++++----- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 8 +++++++- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java | 12 +++++++----- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java | 3 ++- 7 files changed, 43 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 2ee9a19..1f1b343 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; 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.Transient; +import javax.persistence.*; import java.io.Serializable; import java.util.Date; @@ -28,7 +25,12 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_ACTUAL") +@Table(name = "MES_QUEUE_JIT_ACTUAL", indexes = { + @Index(columnList = "JIS_ACTUAL_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "VIN_CODE"), + @Index(columnList = "JIT_SEQ") +}) @NoArgsConstructor @AllArgsConstructor @Builder diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index 93f729c..a73e9fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.io.Serializable; @@ -28,7 +29,12 @@ import java.io.Serializable; @AllArgsConstructor @Builder @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM") +@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM", indexes = { + @Index(columnList = "JIS_ACTUAL_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "PRODUCE_CTGY_CODE"), + @Index(columnList = "PART_NO") +}) @Api("客户JIT生产队列散件清单") public class MesQueueJitActualBom extends BaseBean implements Serializable { private static final long serialVersionUID = 1604529847020812472L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index f0f5944..02a2791 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -7,10 +7,7 @@ import lombok.*; 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.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -27,7 +24,12 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @AllArgsConstructor @Builder -@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL") +@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL", indexes = { + @Index(columnList = "JIS_ACTUAL_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "PART_NO"), + @Index(columnList = "PRODUCE_CTGY_CODE") +}) @Api("MES_客户JIT生产队列明细") public class MesQueueJitActualDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index 03b4987..76bf686 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -9,11 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -28,7 +24,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_PLAN") +@Table(name = "MES_QUEUE_JIT_PLAN", indexes = { + @Index(columnList = "JIS_PLAN_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "VIN_CODE") +}) @Api("MES_客户JIT预装队列") public class MesQueueJitPlan extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index f7eedab..09e3317 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.io.Serializable; @@ -26,7 +27,12 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_PLAN_BOM") +@Table(name = "MES_QUEUE_JIT_PLAN_BOM", indexes = { + @Index(columnList = "JIS_PLAN_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "PRODUCE_CTGY_CODE"), + @Index(columnList = "PART_NO") +}) @Api("MES_客户JIT预装队列BOM") public class MesQueueJitPlanBom extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index b2631fb..5c2c766 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -8,10 +8,7 @@ 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.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +23,12 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL") +@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL", indexes = { + @Index(columnList = "JIS_PLAN_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "PRODUCE_CTGY_CODE"), + @Index(columnList = "PART_NO") +}) @Api("MES_客户JIT预装队列明细") public class MesQueueJitPlanDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index 4799548..2742925 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -27,7 +27,8 @@ import java.io.Serializable; @Table(name = "MES_QUEUE_ORDER_BOM", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "ORDER_NO"), - @Index(columnList = "PART_NO") + @Index(columnList = "PART_NO"), + @Index(columnList = "PRODUCE_CTGY_CODE") }) @Api("MES_生产队列散件清单") public class MesQueueOrderBom extends BaseBean implements Serializable { From 0009db6b33edd2010a98a9970f227029e1dff877 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 20 Nov 2020 16:55:28 +0800 Subject: [PATCH 135/329] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index b30a7dc..b8e2556 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2783,8 +2783,8 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCellSkill, organizeCode); + public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());; if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) { DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean); } From f63813d66dfd9a67f7b4cdcc2a1d3b979152417d Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 20 Nov 2020 20:53:18 +0800 Subject: [PATCH 136/329] =?UTF-8?q?=E5=90=88=E5=B9=B6master=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 3751cf9..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a6c1bea..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0a2f9d4..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 2bf0e5c..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 557548a..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 34a7337..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 670eb15..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ce2dc01..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index b8c9643..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1d29933..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 284225c..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 7ff16c9..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 353a02b..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b125cee..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index c9d54a9..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 39f1e2f..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index df01041..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 0cfb344..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 89a45d326b2166df915174460462b98da93d4ecf Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 20 Nov 2020 21:02:19 +0800 Subject: [PATCH 137/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..3751cf9 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..a6c1bea 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..0a2f9d4 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..2bf0e5c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..557548a 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..34a7337 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..670eb15 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..ce2dc01 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..b8c9643 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..1d29933 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..284225c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..7ff16c9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..353a02b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..b125cee 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..c9d54a9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..39f1e2f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..df01041 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..0cfb344 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..ae014e9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From b57ae573ed8d9a256e7bf046c8b723ce764964a9 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 20 Nov 2020 21:12:00 +0800 Subject: [PATCH 138/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From b9283ec075f98dd67a77bc6117ae090c5d8081e4 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 20 Nov 2020 21:19:17 +0800 Subject: [PATCH 139/329] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 9d7ae4a90fb23b9ec7210b87f34c36cac9fd6932 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 21 Nov 2020 02:05:46 +0800 Subject: [PATCH 140/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E9=A2=86=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 26 ++++++++++++++++++++++ 1 file changed, 26 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 23fe0d2..4084304 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 @@ -537,6 +537,32 @@ public class WmsStockSn extends BaseBean { @ApiParam("原数量") private Double srcQty; + @Transient + @ApiParam("库位X") + private Integer x; + + @Transient + @ApiParam("库位Y") + private Integer y; + + @Transient + @ApiParam("库位Z") + private Integer z; + + public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z) { + this.sn = sn; + this.vendorNo = vendorNo; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.locateNo = locateNo; + this.x = x; + this.y = y; + this.z = z; + } + public WmsStockSn() { } From c03446866ab1f0d6b7d53ae798521ad2cc25fce5 Mon Sep 17 00:00:00 2001 From: simon Date: Sat, 21 Nov 2020 23:58:30 +0800 Subject: [PATCH 141/329] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E5=8D=95=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index fb90c4c..03c2cd2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -127,4 +127,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("检测值") private String checkValue; + @Transient + @ApiParam("质检单检测记录id") + private Long qcOrderRecordId; + } From 6c04caf7288a4cb77840072025d22845ca88e2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 22 Nov 2020 17:21:53 +0800 Subject: [PATCH 142/329] =?UTF-8?q?=E3=80=90=E5=A4=A9=E6=B4=A5=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=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/mes/bean/MesBoardLine.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java index 2e75537..cbc02b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -81,5 +81,9 @@ public class MesBoardLine extends BaseBean implements Serializable { @ApiParam("是否展示") private Integer isDisplay; + @Column(name = "OEE_RED_LINE_VALUE") + @ApiParam("OEE红线值") + private String oeeRedLineValue; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 8bcab46..1d95ab2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -59,4 +59,7 @@ public class MgnBoardListModel { @ApiParam("产线集合") private List workCenterList; + @ApiParam("平均OEE") + private Double oeePercent; + } From bf51e5bb7ab1f829fbfd8d77c7576e7b249ffb20 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 22 Nov 2020 20:08:01 +0800 Subject: [PATCH 143/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=B8=BA=E5=9B=BA=E5=AE=9A=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index e651958..92d9c88 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -28,7 +28,7 @@ public class WmsAutoPurchasePartModel extends Pager { private String unit; @ApiParam("物料数量") - private Integer qty; + private Double qty; @ApiParam("Erp库存地") private String erpWarehouse; @@ -44,8 +44,7 @@ public class WmsAutoPurchasePartModel extends Pager { private Integer preReceivingDay; - - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer preReceivingDay) { + public WmsAutoPurchasePartModel(String partNo, String partName, Double qty, String warehouse, Integer preReceivingDay) { this.partNo = partNo; this.partName = partName; this.qty = qty; From 59f916ddabfd765f2dc92e83fbc2a799661f84e1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 22 Nov 2020 20:11:19 +0800 Subject: [PATCH 144/329] produceSn --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 ----- .../estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 5 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 a024e83..c0b3162 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,11 +159,6 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("Vin") private String vinCode; -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public transient Integer lockVersion; - @Transient @ApiParam("返回信息") private String resultMsg; 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 76c61d8..0db7bb7 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 @@ -143,6 +143,22 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; + @Column(name = "PROCESS_LABEL_TEMPLATE") + @ApiParam("过程标签模板") + private String processLabelTemplate; + + @Column(name = "PROD_LABEL_TEMPLATE") + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Column(name = "CUST_LABEL_TEMPLATE") + @ApiParam("客户标签模板") + private String custLabelTemplate; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + @Transient @ApiParam("返回信息") private String resultMsg; From 4757408a3bbb0577762d0da865827f865aaee1c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 22 Nov 2020 20:15:07 +0800 Subject: [PATCH 145/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2965?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsBjmgnBbacReductModel.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java new file mode 100644 index 0000000..f8a5552 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 北京麦格纳BBAC库存扣减导入MODEL + * @Reference + * @Author dragon + * @CreateDate 2020/11/22 14:46 + * @Modify + */ +@Data +@Api("北京麦格纳BBAC库存扣减导入MODEL") +public class WmsBjmgnBbacReductModel implements Serializable { + @ApiParam("JIS号") + public String jisNo; + @ApiParam("物料号") + public String partNo; + @ApiParam("项目编码") + public String projectNo; + @ApiParam("客户编码") + public String custNo; +} From a6ca2b35d367e80644cc8f0d33311f04d0fb193c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 23 Nov 2020 03:53:32 +0800 Subject: [PATCH 146/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E9=A2=86=E6=96=99?= 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 | 5 +++++ 1 file changed, 5 insertions(+) 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 e34f49c..eac12a1 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 @@ -17,6 +17,7 @@ import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; +import java.util.List; /** * @Description : PO订单明细信息 @@ -236,6 +237,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("汇总收货数量") private Double sumRcQty; + @Transient + @ApiParam("单据集合") + private List orderNoLst; + /** * 状态:1=新建,10=收货中,20=收货完成, From be8d655eb96fb4c0ea75ba50498a23d9a3f22e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 23 Nov 2020 15:22:47 +0800 Subject: [PATCH 147/329] =?UTF-8?q?=E3=80=9012420=2019048=20=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E4=BA=8C=E6=A3=80=E5=A2=9E=E5=8A=A0UNPACK=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=2020201112=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index b8e2556..de9e92c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3661,4 +3661,13 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesEnum(MesEnum mesEnum) { + DdlPackBean packBean = getAllBaseData(mesEnum.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesEnum.getEnumCode(), "enumCode", packBean); + DdlPreparedPack.getStringLikerPack(mesEnum.getEnumName(), "enumName", packBean); + DdlPreparedPack.getStringLikerPack(mesEnum.getEnumValue(), "enumValue", packBean); + DdlPreparedPack.getNumEqualPack(mesEnum.getIsValid(), "isValid", packBean); + return packBean; + } + } From 22ec710d78ab2b88dd71ab2efbf34d7360b0ee01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 23 Nov 2020 15:24:17 +0800 Subject: [PATCH 148/329] =?UTF-8?q?=E3=80=9012420=2019048=20=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E4=BA=8C=E6=A3=80=E5=A2=9E=E5=8A=A0UNPACK=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=2020201112=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesEnum.java | 49 ++++++++++++++++++++++ .../pojo/mes/repository/MesEnumRepository.java | 14 +++++++ 2 files changed, 63 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java new file mode 100644 index 0000000..6c9aa12 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java @@ -0,0 +1,49 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ENUM") +@Api("MES_枚举表") +public class MesEnum extends BaseBean implements Serializable { + + private static final long serialVersionUID = 368174781823424116L; + + @Column(name = "ENUM_CODE") + @ApiParam("枚举代码") + private String enumCode; + + @Column(name = "ENUM_NAME") + @ApiParam("枚举名称") + private String enumName; + + @Column(name = "ENUM_VALUE") + @ApiParam("枚举值") + private String enumValue; + + @Column(name = "ENUM_VALUE_DESC") + @ApiParam("枚举值描述") + private String enumValueDesc; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java new file mode 100644 index 0000000..64ea242 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEnum; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:32 + * @Modify: + **/ +public interface MesEnumRepository extends BaseRepository { +} From f6260cec3916dec2d8812fbbc3f73da88a3affa4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 23 Nov 2020 16:10:46 +0800 Subject: [PATCH 149/329] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index de9e92c..9f50d9d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3670,4 +3670,24 @@ public class MesHqlPack { return packBean; } + /** + * MES_看板产线配置查询条件封装 + * + * @param boardLine + * @return + */ + public static DdlPackBean getBoardLine(MesBoardLine boardLine) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardLine.getOrganizeCode()); + if (!StringUtils.isEmpty(boardLine.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(boardLine.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(boardLine.getAreaCode())) { + DdlPreparedPack.getStringLikerPack(boardLine.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(boardLine.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(boardLine.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + } From 66de2c1cbb2c795e7df31197c2b87d7925671b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 23 Nov 2020 17:11:02 +0800 Subject: [PATCH 150/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2965?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsBjmgnBbacReductModel.java | 28 ++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java index f8a5552..51867fc 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java @@ -8,14 +8,14 @@ import java.io.Serializable; import java.util.List; /** - * @Description 北京麦格纳BBAC库存扣减导入MODEL + * @Description 北京麦格纳BBAC库存扣减MODEL * @Reference * @Author dragon * @CreateDate 2020/11/22 14:46 * @Modify */ @Data -@Api("北京麦格纳BBAC库存扣减导入MODEL") +@Api("北京麦格纳BBAC库存扣减MODEL") public class WmsBjmgnBbacReductModel implements Serializable { @ApiParam("JIS号") public String jisNo; @@ -25,4 +25,28 @@ public class WmsBjmgnBbacReductModel implements Serializable { public String projectNo; @ApiParam("客户编码") public String custNo; + @ApiParam("存储区") + public String zoneNo; + @ApiParam("ERP库存地") + public String erpAreaNo; + @ApiParam("项目名称") + public String projectName; + @ApiParam("数量") + public Double qty; + @ApiParam("单位") + public String unit; + + public WmsBjmgnBbacReductModel() { + } + + public WmsBjmgnBbacReductModel(String custNo,String zoneNo,String jisNo, String partNo, String projectNo, + Double qty, String unit) { + this.custNo = custNo; + this.zoneNo = zoneNo; + this.jisNo = jisNo; + this.partNo = partNo; + this.projectNo = projectNo; + this.qty = qty; + this.unit = unit; + } } From 5cea79571b0a33e152d85e596ad0c1a2fc1850f9 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 24 Nov 2020 10:42:47 +0800 Subject: [PATCH 151/329] =?UTF-8?q?PO=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 38 ++++++++-------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 50964f2..6575cee 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -59,7 +59,7 @@ public class SwebHqlPack { } DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(purchaseOrder, result); } @@ -81,11 +81,10 @@ public class SwebHqlPack { poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue()); poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue()); poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue()); - //poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue()); DdlPreparedPack.getInPackList(poStatus, "poStatus", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(purchaseOrder, result); } @@ -94,7 +93,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebPackage, result); } @@ -102,7 +101,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result); DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebConfig, result); } @@ -121,7 +120,7 @@ public class SwebHqlPack { HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return result.toString(); } @@ -134,7 +133,7 @@ public class SwebHqlPack { // 封装有效状态和删除状态 DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(model, result); } @@ -142,7 +141,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrder, result); } @@ -151,7 +150,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrderDetails, result); } @@ -159,7 +158,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(vendorRel, result); } @@ -208,22 +207,13 @@ public class SwebHqlPack { return buildHql(details, result); } -// public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) { -// DdlPackBean result = new DdlPackBean(); -// DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result); -// DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result); -// DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result); -// DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); -// return buildHql(master, result); -// } - public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(details, result); } @@ -242,7 +232,7 @@ public class SwebHqlPack { if (!StringUtil.isEmpty(capcity.getDateEnd())) { DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result); } - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(capcity, result); } @@ -260,7 +250,7 @@ public class SwebHqlPack { if (!StringUtil.isEmpty(alarm.getDateEnd())) { DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); } - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(alarm, result); } @@ -272,7 +262,7 @@ public class SwebHqlPack { DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); } DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(stock, result); } @@ -285,7 +275,7 @@ public class SwebHqlPack { } DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(alarm, result); } } From db87c0c32ff920f7722c0389a2abb67a2279eabb Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 24 Nov 2020 11:15:22 +0800 Subject: [PATCH 152/329] =?UTF-8?q?pom=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..57e0a76 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..5730ec1 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..04f33d2 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..42a8d25 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..bc6545f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..d68e1ab 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..891ddeb 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..c169cc4 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..860f573 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..fe03472 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..2b2428f 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..6eab360 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..de71a5d 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..51a2226 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..4e15179 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..0c96be2 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..47eeb2a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..90165f3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..6cd210c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..f3a601d 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..1c0695f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0.0.1 modules/i3plus-pojo-base modules/i3plus-pojo-platform From 6fe792f75b2b6c6420ba605ab44a89b55e617605 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 24 Nov 2020 11:51:15 +0800 Subject: [PATCH 153/329] =?UTF-8?q?posn=E6=96=B0=E5=A2=9E=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=94=9F=E4=BA=A7=E6=89=B9=E6=AC=A1=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) 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 1d731cd..081c0bb 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 @@ -869,7 +869,8 @@ public class WmsEnumUtil { WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), OTHER_IN(730, "OTHER_IN", "其它入库"), OTHER_OUT(740, "OTHER_OUT", "其它出库"), - COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"); + COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"), + SUPPLIER_STD_RETURN(80, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR private int value; private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index d3ba94f..c414b10 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -103,6 +105,11 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; +// @Column(name = "DATE_CODE", nullable = false) +// @ApiParam(value = "供应商生产批次") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) +// public String dateCode = ""; + @ApiParam(value = "供应商名称") @Transient public String vendorNameRdd; @@ -119,8 +126,9 @@ public class WmsPoSn extends BaseBean { @Transient public String lotNo; - @Transient - @ApiParam(value = "生产日期") + @Column(name = "DATE_CODE", nullable = false) + @ApiParam(value = "供应商生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String dateCode; @Transient From 2d47eeb84d2e6f543aeca613dea7713b53f100f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 24 Nov 2020 15:17:18 +0800 Subject: [PATCH 154/329] BUG#12487 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 3fd7418..1cfd31a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -268,8 +268,8 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", this.z = z; } - public WmsLocate(Integer boxQty , Double partQty,String locateNo){ - this.boxQty=boxQty; + public WmsLocate(Long boxQty , Double partQty,String locateNo){ + this.boxQty=boxQty.intValue(); this.partQty=partQty; this.locateNo=locateNo; } From 70f659593b973603c95748fea809c2ce2efc8002 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 24 Nov 2020 20:47:22 +0800 Subject: [PATCH 155/329] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20cron=20=E8=A1=A8=E8=BE=BE=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 11 +++++++++++ 1 file changed, 11 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 d9b5dd4..c5fccfa 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 @@ -124,6 +124,17 @@ public class WmsInterfaceDataMapper extends BaseBean { public Integer syncFrequency; /** + * 同步时间 CRON 表达式 + */ + @Column(name = "SYNC_CRON") + public String syncCron; + /** + * 下次同步时间，与 syncCron 属性同时使用 + */ + @Column(name = "NEXT_SYNC_TIME") + public String nextSyncTime; + + /** * 上次同步时间 */ @Column(name = "LAST_SYNC_TIME") From 21cfe5c74083f7f3d852f651536e08d799114f76 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 25 Nov 2020 00:38:46 +0800 Subject: [PATCH 156/329] =?UTF-8?q?Fix=20bug#12004=2019058-KT=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=87=BA=E5=BA=93=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 46 ++++++++++++++++++++++ 1 file changed, 46 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 d8f8ada..4639099 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 @@ -215,6 +215,23 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "原因", example = "1") public String reason; + @Column(name = "RECEIVE_DATE") + @ApiParam(value = "收货日期") + public String receiveDate; + + @Column(name = "RECEIVE_TIME") + @ApiParam(value = "收货时间") + public String receiveTime; + + @Column(name = "WINDOW_START_TIME") + @ApiParam(value = "窗口开始时间") + public String windowStartTime; + + @Column(name = "WINDOW_END_TIME") + @ApiParam(value = "窗口结束时间") + public String windowEndTime; + + @Transient @ApiParam("周总数") private Integer weekRcCount; @@ -227,6 +244,18 @@ public class WmsPOMaster extends BaseBean { @ApiParam("当前状态") private String nowStatus; + @ApiParam(value = "延迟次数") + private Long delayCount; + + @ApiParam(value = "延迟次数") + private Long sumDelayCount; + + @ApiParam("计划交货时间") + private String planPlanDateTime; + + + + public WmsPOMaster() { @@ -264,6 +293,23 @@ public class WmsPOMaster extends BaseBean { this.delayHour = delayHour; } + public WmsPOMaster(String vendorNo, Long delayCount) { + this.vendorNo = vendorNo; + this.delayCount = delayCount; + } + + public WmsPOMaster(String orderNo, String reason, String planDate, String planTime, + String receiveTime, String vendorNo, String vendorName, String organizeCode) { + this.orderNo = orderNo; + this.reason = reason; + this.planDate = planDate; + this.planTime = planTime; + this.receiveTime = receiveTime; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.organizeCode = organizeCode; + } + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } From cf9d3d9f2dbbcfd959ad5725fd9e99d1c38948cd Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 25 Nov 2020 04:47:05 +0800 Subject: [PATCH 157/329] =?UTF-8?q?tz=20=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesShiftRestModel.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java new file mode 100644 index 0000000..dd422cb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesShiftRestModel extends MesShiftRest { + + @ApiParam("开始时间") + private String startDate; + + @ApiParam("结束时间") + private String endDate; + + @ApiParam("实际时间差(毫秒)") + private Long subTimes; + +} From 3ebcfd21e71fab9a3fcb1f7f6560ebf25a5a331c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 25 Nov 2020 11:26:06 +0800 Subject: [PATCH 158/329] BUG#12711,12509 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 879e3d2..9ccaf61 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 @@ -2030,6 +2030,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); From a604e70771bde74794dc67d8cda0ad8ebf5be20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 25 Nov 2020 11:41:39 +0800 Subject: [PATCH 159/329] BUG#12711 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9ccaf61..d7adefb 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 @@ -2030,7 +2030,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); - DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getSrcLocateNo(), "srcLocateNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getDestLocateNo(), "destLocateNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); From c679e7f19befc9bec11cfef88567ac51f9adee30 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 25 Nov 2020 11:45:00 +0800 Subject: [PATCH 160/329] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index e803e6c..96ee98a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -67,6 +67,12 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("时段") private String timeInterval; + @ApiParam("温度") + private String temperature; + + @ApiParam("湿度") + private String humidity; + @ApiParam("x坐标内容") private List xAxisList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 9f50d9d..bcde4c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2491,7 +2491,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean); } if (!StringUtils.isEmpty(queueJitActual.getRelationVinCode())) { - DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "replaceVinCode", packBean); + DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "relationVinCode", packBean); } if (queueJitActual.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); From 36130d12f2132c118ba4ccb8e1081a1e92425479 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 25 Nov 2020 11:47:16 +0800 Subject: [PATCH 161/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E9=80=80=E8=B4=A7=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 081c0bb..14d440e 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 @@ -870,7 +870,7 @@ public class WmsEnumUtil { OTHER_IN(730, "OTHER_IN", "其它入库"), OTHER_OUT(740, "OTHER_OUT", "其它出库"), COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"), - SUPPLIER_STD_RETURN(80, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR + SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR private int value; private String code; From fa3bb1f53a37f55c5053d9fa2523727e688e4043 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 25 Nov 2020 14:42:10 +0800 Subject: [PATCH 162/329] =?UTF-8?q?=E6=B6=82=E8=A3=85=20=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 1d95ab2..4852d46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -38,6 +38,9 @@ public class MgnBoardListModel { @ApiParam("计划完成率") private String planCompleteRate; + @ApiParam("当前数据标识") + private boolean currentInfo; + @ApiParam("呼叫异常数量") private Integer exceptQty; From 6ffec48185e4c5315435ed6b1369c283215c6e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 25 Nov 2020 16:46:26 +0800 Subject: [PATCH 163/329] =?UTF-8?q?=E3=80=902977=2011=202.5.5=20=E6=95=B4?= =?UTF-8?q?=E5=BD=A2=E4=B8=9A=E5=8A=A1=EF=BC=8C=E5=8D=95=E4=BB=B6=E7=BF=BB?= =?UTF-8?q?=E5=8C=85=E4=B8=8E=E6=95=B4=E7=AE=B1=E8=BF=87=E7=AB=99=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/mes/bean/MesPackage.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java | 3 +++ .../estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index fc5e470..ad0869f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -185,6 +185,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("客户名称") private String custName; + @Transient + @ApiParam("汇总数量") + private Integer gatherQty = 0; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 7cbd75b..94dacc2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -91,6 +91,9 @@ public class GenSerialNoModel { @ApiParam("客户工厂代码") private String custProdLineCode; + @ApiParam("工序代码") + private String processCode; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java index ad4b799..982b340 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java @@ -45,10 +45,14 @@ public class MgnPackageSnTraceReportModel { @ApiParam(value = "修改日期查询用，查询结束日期") public String createDateTimeEnd; + + @ApiParam(value = "工单号") + public String workOrderNo; + public MgnPackageSnTraceReportModel() { } - public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName) { + public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName, String workOrderNo) { this.packageNo = packageNo; this.packageNo2 = packageNo2; this.serialNumber = serialNumber; @@ -58,5 +62,7 @@ public class MgnPackageSnTraceReportModel { this.createDatetime = createDatetime; this.workCenterCode = workCenterCode; this.workCenterName = workCenterName; + this.workOrderNo = workOrderNo; + } } From ee37d6f5eba9f147595f48b48eb837349efacb39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 25 Nov 2020 18:31:41 +0800 Subject: [PATCH 164/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#12597?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsVendorDock.java | 47 ++++++++++++++++++++++ .../wms/repository/WmsVendorDockRepository.java | 17 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++ 3 files changed, 70 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java new file mode 100644 index 0000000..e438613 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +/** + * @Description 供应商道口信息 + * @Reference + * @Author dragon + * @CreateDate 2020/11/25 13:43 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_VENDOR_DOCK") +@Api("供应商道口信息") +public class WmsVendorDock extends BaseBean { + private static final long serialVersionUID = 662346332597842770L; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String vendorNo; + + @Column(name="DOCK_CODE") + @ApiParam("道口代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String dockCode; + + @Column(name="DOCK_ADDRESS") + @ApiParam("道口发运地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String dockAddress; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java new file mode 100644 index 0000000..9a10063 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorDockRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorDock; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description 供应商道口DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/11/25 14:43 + * @Modify + */ +@Repository +public interface WmsVendorDockRepository extends BaseRepository { +} 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 d7adefb..d549c1f 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 @@ -3553,4 +3553,10 @@ public class WmsHqlPack { return result; } + public static DdlPackBean packHqlWmsDock(WmsDock wmsDock) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringRightLikerPack(wmsDock.getDockCode(), "dockCode", result); + getStringBuilderPack(wmsDock, result); + return result; + } } From 20999fd63a7cd5c5c06365ac5dadfbcb41f38873 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 25 Nov 2020 19:55:14 +0800 Subject: [PATCH 165/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E5=93=81=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/repository/MesDefectLocationRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java new file mode 100644 index 0000000..19fe9e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectLocationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectLocation; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate:2020-11-25 19:51:00 + * @Modify: + **/ +@Repository +public interface MesDefectLocationRepository extends BaseRepository { +} From 2f56f8949e848892de5ea5098ef932a5ae149164 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 25 Nov 2020 21:02:29 +0800 Subject: [PATCH 166/329] =?UTF-8?q?eol=E7=9C=8B=E6=9D=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 96ee98a..ef5f899 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -73,6 +73,12 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("湿度") private String humidity; + @ApiParam("工位代码") + private String workCellCode; + + @ApiParam("工位名称") + private String workCellName; + @ApiParam("x坐标内容") private List xAxisList; From 9b70e3c7bf82a3c051721e3424b7567da6d9c98e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Nov 2020 10:43:54 +0800 Subject: [PATCH 167/329] =?UTF-8?q?fifo=20=E6=8E=A8=E8=8D=90=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 70f38db..d5df633 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -49,6 +49,9 @@ public class WmsStockFifoModel { @ApiParam("FIFO查询获取方式") private Integer fifoSnByLood; + @ApiParam("过滤FIFO锁定条码") + private Integer filterFifoLockSn; + @ApiParam("物料条码信息") Map> snMap = new HashMap<>(); From c1e3b01524537370d6db1345390e896bee40ad14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Nov 2020 14:55:39 +0800 Subject: [PATCH 168/329] BUG#12504 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 4639099..00f26d8 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 @@ -250,6 +250,9 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "延迟次数") private Long sumDelayCount; + @ApiParam(value = "延迟到货百分比") + private String delayPercent; + @ApiParam("计划交货时间") private String planPlanDateTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index d2bd144..b719cdd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -36,7 +36,7 @@ public class WmsVendorDelayMasterModel extends BaseBean { private Long sumDelayCount; @ApiParam(value = "延迟到货百分比") - private Double delayPercent; + private String delayPercent; @ApiParam(value = "查询开始时间") private String startDateTime; @@ -85,4 +85,5 @@ public class WmsVendorDelayMasterModel extends BaseBean { public WmsVendorDelayMasterModel() { } + } From 787629581f4211ce7f1297e40330cf1cf17c719d Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 26 Nov 2020 15:11:03 +0800 Subject: [PATCH 169/329] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E6=96=B9=E5=90=91=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0SWEB2SAP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 6e210ce..34dbb05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -11,6 +11,7 @@ public class WmsInterfaceEnumUtil { MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), + SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"), WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"); @@ -61,6 +62,7 @@ public class WmsInterfaceEnumUtil { /** * -1 不在范围内 + * * @param desc * @return */ From 802d5d2320f186003bf52c3439d7cd3f18633205 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 26 Nov 2020 15:11:55 +0800 Subject: [PATCH 170/329] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=A8-=E4=B8=BB=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 73c18c8..329db54 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -122,4 +123,8 @@ public class SwebPurchaseOrder extends BaseBean { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 结束时间") private String expectedTimeEnd; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } From eb14a581b98ed104d6cf824eb42291a180ba14b8 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 26 Nov 2020 17:32:35 +0800 Subject: [PATCH 171/329] =?UTF-8?q?=E5=9D=A4=E6=B3=B0=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 6037326..cbe1519 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -78,7 +78,7 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "SNP_QTY") @ColumnDefault("0") - @ApiParam(value = "默认包装规格", example = "0") + @ApiParam(value = "包装数量", example = "0") private Double snpQty; @Column(name = "PRINT_QTY") From 0bcb0093839651595d58c7abaee4fe55e4454cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 26 Nov 2020 17:51:36 +0800 Subject: [PATCH 172/329] =?UTF-8?q?=E3=80=902977=2011=202.5.5=20=E6=95=B4?= =?UTF-8?q?=E5=BD=A2=E4=B8=9A=E5=8A=A1=EF=BC=8C=E5=8D=95=E4=BB=B6=E7=BF=BB?= =?UTF-8?q?=E5=8C=85=E4=B8=8E=E6=95=B4=E7=AE=B1=E8=BF=87=E7=AB=99=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java new file mode 100644 index 0000000..896870a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfPackage; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfPackageRepository extends BaseRepository { +} From a38be26538227fe0be9d9a5835627a57d318390a Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 26 Nov 2020 19:38:44 +0800 Subject: [PATCH 173/329] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=A8-=E4=B8=BB=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E8=AF=86=E3=80=81=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E6=96=B9=E5=90=91=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 5 +++++ .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 1 + 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 73c18c8..329db54 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -122,4 +123,8 @@ public class SwebPurchaseOrder extends BaseBean { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 结束时间") private String expectedTimeEnd; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 6e210ce..2e0383f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -11,6 +11,7 @@ public class WmsInterfaceEnumUtil { MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), + SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"), WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"); From 7aa7738a591f33f08cc7205f09e85c16def36947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Nov 2020 19:55:20 +0800 Subject: [PATCH 174/329] BUG#12600 --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java index 1cad321..2b7f8b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -62,6 +62,14 @@ public class WmsPickingWindowTime extends BaseBean { private String shiftEndTime; @Transient + @ApiParam("今日结束时间") + private String todayEndTime; + + @Transient + @ApiParam("次日开始时间") + private String nextDayStartTime; + + @Transient @ApiParam("源存储区代码") public String srcZoneNo; From af732b7a4fc9c72ef3a6bbec5d023e186eac3f36 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 26 Nov 2020 20:07:35 +0800 Subject: [PATCH 175/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From e0ee86ab738224d89729635be72d85da6a37dd32 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 26 Nov 2020 23:51:27 +0800 Subject: [PATCH 176/329] =?UTF-8?q?=E5=88=A0=E9=99=A4mes-pcn=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=BC=95=E5=85=A5=E7=B1=BB=E4=BB=A5?= =?UTF-8?q?mes=E5=8C=85=E4=B8=BA=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 55 --- .../pojo/mes/pcn/bean/IfDismantleRecord.java | 105 ------ .../i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 100 ----- .../i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 88 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesAction.java | 48 --- .../i3plus/pojo/mes/pcn/bean/MesActionIf.java | 40 -- .../i3plus/pojo/mes/pcn/bean/MesActionMethod.java | 49 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 59 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java | 90 ----- .../i3plus/pojo/mes/pcn/bean/MesCachaQueue.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesCellFeed.java | 79 ---- .../pojo/mes/pcn/bean/MesCellFeedRecord.java | 74 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesCustProdLine.java | 40 -- .../i3plus/pojo/mes/pcn/bean/MesCustomer.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesCustomerPart.java | 49 --- .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 71 ---- .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 82 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 80 ---- .../i3plus/pojo/mes/pcn/bean/MesDefectCause.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 80 ---- .../pojo/mes/pcn/bean/MesDismantleRecord.java | 97 ----- .../pojo/mes/pcn/bean/MesEquAlarmRecord.java | 53 --- .../i3plus/pojo/mes/pcn/bean/MesEquipment.java | 97 ----- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java | 93 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java | 52 --- .../i3plus/pojo/mes/pcn/bean/MesEventAction.java | 54 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java | 47 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java | 59 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java | 65 ---- .../i3plus/pojo/mes/pcn/bean/MesKpsnRule.java | 95 ----- .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 54 --- .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 55 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java | 55 --- .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 52 --- .../pojo/mes/pcn/bean/MesMonitorTaskDetail.java | 48 --- .../i3plus/pojo/mes/pcn/bean/MesNumberRule.java | 60 --- .../pojo/mes/pcn/bean/MesNumberSerialno.java | 49 --- .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 60 --- .../i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 62 ---- .../i3plus/pojo/mes/pcn/bean/MesPackSpec.java | 99 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 119 ------ .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 63 ---- .../i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 58 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 93 ----- .../i3plus/pojo/mes/pcn/bean/MesPartCategory.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesPartFormula.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 68 ---- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 87 ----- .../i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java | 55 --- .../i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java | 92 ----- .../pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 54 --- .../pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 70 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 90 ----- .../i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java | 53 --- .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 144 -------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 112 ------ .../estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java | 39 -- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 106 ------ .../estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java | 53 --- .../i3plus/pojo/mes/pcn/bean/MesProdPack.java | 69 ---- .../i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 45 --- .../pojo/mes/pcn/bean/MesProdRouteOptParam.java | 71 ---- .../pojo/mes/pcn/bean/MesProdScatterCfgBom.java | 55 --- .../pojo/mes/pcn/bean/MesProduceCategory.java | 40 -- .../pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 205 ---------- .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 154 -------- .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 109 ------ .../pojo/mes/pcn/bean/MesProductEncodeCfg.java | 50 --- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 107 ------ .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 108 ------ .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 71 ---- .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 62 ---- .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 90 ----- .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 103 ------ .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 78 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 102 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 51 --- .../i3plus/pojo/mes/pcn/bean/MesRouteProcess.java | 64 ---- .../pojo/mes/pcn/bean/MesRouteProcessCell.java | 44 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 71 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 68 ---- .../i3plus/pojo/mes/pcn/bean/MesShiftGroup.java | 47 --- .../i3plus/pojo/mes/pcn/bean/MesShiftRest.java | 49 --- .../pojo/mes/pcn/bean/MesSnPhotoRelation.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesStationBom.java | 151 -------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java | 102 ----- .../i3plus/pojo/mes/pcn/bean/MesStepParam.java | 47 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java | 40 -- .../i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 97 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java | 48 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 83 ----- .../i3plus/pojo/mes/pcn/bean/MesWcEquipment.java | 43 --- .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 64 ---- .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 64 ---- .../i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java | 48 --- .../pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java | 56 --- .../pojo/mes/pcn/bean/MesWorkCellStatus.java | 47 --- .../i3plus/pojo/mes/pcn/bean/MesWorkCenter.java | 57 --- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 249 ------------- .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 231 ------------ .../pojo/mes/pcn/model/ActionRequestBean.java | 38 -- .../estsh/i3plus/pojo/mes/pcn/model/AttrBean.java | 17 - .../i3plus/pojo/mes/pcn/model/ButtonBean.java | 22 -- .../pojo/mes/pcn/model/DataAcquisitionModel.java | 35 -- .../i3plus/pojo/mes/pcn/model/DefectModel.java | 49 --- .../i3plus/pojo/mes/pcn/model/EsopFileModel.java | 26 -- .../pojo/mes/pcn/model/FastDfsDownloadModel.java | 31 -- .../pojo/mes/pcn/model/GenSerialNoModel.java | 72 ---- .../pojo/mes/pcn/model/MesButtonFlagModel.java | 57 --- .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 35 -- .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 125 ------- .../pojo/mes/pcn/model/MesStationBomModel.java | 75 ---- .../pojo/mes/pcn/model/PLCInteracticeModel.java | 50 --- .../pojo/mes/pcn/model/PcsObserverStatusModel.java | 25 -- .../pojo/mes/pcn/model/ProdPackageModel.java | 78 ---- .../pojo/mes/pcn/model/ProductDataModel.java | 24 -- .../pojo/mes/pcn/model/QcCheckStandardModel.java | 25 -- .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 90 ----- .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 82 ---- .../i3plus/pojo/mes/pcn/model/RequestModel.java | 151 -------- .../pojo/mes/pcn/model/SnPrintDataModel.java | 27 -- .../i3plus/pojo/mes/pcn/model/SnPrintModel.java | 27 -- .../i3plus/pojo/mes/pcn/model/StationBomModel.java | 29 -- .../pojo/mes/pcn/model/StationResultBean.java | 55 --- .../i3plus/pojo/mes/pcn/model/StepParamsModel.java | 29 -- .../pojo/mes/pcn/model/StepPrintSnModel.java | 79 ---- .../i3plus/pojo/mes/pcn/model/StepResult.java | 69 ---- .../i3plus/pojo/mes/pcn/model/TorqueModel.java | 71 ---- .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 63 ---- .../repository/IfDismantleRecordRepository.java | 14 - .../pcn/repository/IfPackageDetailRepository.java | 14 - .../pcn/repository/IfProductOffLineRepository.java | 14 - .../mes/pcn/repository/MesActionIfRepository.java | 14 - .../pcn/repository/MesActionMethodRepository.java | 16 - .../mes/pcn/repository/MesActionRepository.java | 17 - .../pojo/mes/pcn/repository/MesAreaRepository.java | 16 - .../pojo/mes/pcn/repository/MesBomRepository.java | 16 - .../repository/MesCellFeedRecordRepository.java | 14 - .../mes/pcn/repository/MesCellFeedRepository.java | 14 - .../mes/pcn/repository/MesConfigRepository.java | 17 - .../pcn/repository/MesCustProdLineRepository.java | 16 - .../pcn/repository/MesCustomerPartRepository.java | 17 - .../mes/pcn/repository/MesCustomerRepository.java | 17 - .../pcn/repository/MesDataObjectRepository.java | 13 - .../pcn/repository/MesDatasourceRepository.java | 13 - .../pcn/repository/MesDefectCauseRepository.java | 14 - .../pcn/repository/MesDefectRecordRepository.java | 14 - .../mes/pcn/repository/MesDefectRepository.java | 14 - .../repository/MesDismantleRecordRepository.java | 14 - .../mes/pcn/repository/MesEquipmentRepository.java | 16 - .../pojo/mes/pcn/repository/MesEsopRepository.java | 17 - .../pcn/repository/MesEventActionRepository.java | 17 - .../mes/pcn/repository/MesEventRepository.java | 17 - .../mes/pcn/repository/MesFiCfgRepository.java | 17 - .../pojo/mes/pcn/repository/MesFileRepository.java | 16 - .../mes/pcn/repository/MesKpDataRepository.java | 17 - .../mes/pcn/repository/MesKpsnRuleRepository.java | 16 - .../MesLabelTemplateParamRepository.java | 14 - .../pcn/repository/MesLabelTemplateRepository.java | 14 - .../mes/pcn/repository/MesMethodRepository.java | 17 - .../repository/MesMonitorTaskDetailRepository.java | 15 - .../pcn/repository/MesMonitorTaskRepository.java | 15 - .../pcn/repository/MesNumberRuleRepository.java | 15 - .../repository/MesNumberSerialnoRepository.java | 16 - .../mes/pcn/repository/MesObjectCfgRepository.java | 13 - .../pcn/repository/MesPLCConfigureRepository.java | 16 - .../mes/pcn/repository/MesPackSpecRepository.java | 16 - .../pcn/repository/MesPackageDetailRepository.java | 13 - .../mes/pcn/repository/MesPackageRepository.java | 13 - .../pcn/repository/MesPackageTravelRepository.java | 13 - .../pcn/repository/MesPartCategoryRepository.java | 16 - .../pojo/mes/pcn/repository/MesPartRepository.java | 16 - .../pcn/repository/MesPatternJisRepository.java | 16 - .../pcn/repository/MesPcnConnectLogRepository.java | 16 - .../pojo/mes/pcn/repository/MesPcnRepository.java | 16 - .../pcn/repository/MesPcnSyncCfgRepository.java | 16 - .../repository/MesPcnSyncErrorLogRepository.java | 16 - .../repository/MesPcnSysUserOfflineRepository.java | 16 - .../pcn/repository/MesPcnTaskLogRepository.java | 16 - .../mes/pcn/repository/MesPcnTaskRepository.java | 16 - .../mes/pcn/repository/MesPlanOrderRepository.java | 16 - .../pojo/mes/pcn/repository/MesPlcRepository.java | 15 - .../mes/pcn/repository/MesProcessRepository.java | 16 - .../repository/MesProdBindRecordRepository.java | 16 - .../pcn/repository/MesProdCfgDetailRepository.java | 16 - .../mes/pcn/repository/MesProdCfgRepository.java | 16 - .../mes/pcn/repository/MesProdPackRepository.java | 16 - .../pcn/repository/MesProdRouteCfgRepository.java | 16 - .../repository/MesProdRouteOptParamRepository.java | 16 - .../repository/MesProdScatterCfgBomRepository.java | 16 - .../repository/MesProduceCategoryRepository.java | 16 - .../MesProduceCtgyPictureRepository.java | 14 - .../mes/pcn/repository/MesProduceSnRepository.java | 16 - .../repository/MesProduceSnTravelRepository.java | 17 - .../pcn/repository/MesProductDataRepository.java | 16 - .../repository/MesProductEncodeCfgRepository.java | 16 - .../pcn/repository/MesQcCheckDataRepository.java | 14 - .../repository/MesQcCheckStandardRepository.java | 14 - .../repository/MesQueueJisDetailRepository.java | 16 - .../mes/pcn/repository/MesQueueJisRepository.java | 16 - .../repository/MesQueueOrderDetailRepository.java | 16 - .../pcn/repository/MesQueueOrderRepository.java | 16 - .../mes/pcn/repository/MesRawPartSnRepository.java | 15 - .../pcn/repository/MesRepairRecordRepository.java | 14 - .../mes/pcn/repository/MesRepairRepository.java | 16 - .../repository/MesRouteProcessCellRepository.java | 16 - .../pcn/repository/MesRouteProcessRepository.java | 16 - .../mes/pcn/repository/MesRouteRepository.java | 16 - .../pcn/repository/MesScrapRecordRepository.java | 14 - .../mes/pcn/repository/MesScrapRepository.java | 16 - .../pcn/repository/MesShiftGroupRepository.java | 16 - .../mes/pcn/repository/MesShiftRepository.java | 17 - .../mes/pcn/repository/MesShiftRestRepository.java | 16 - .../pcn/repository/MesStationBomRepository.java | 16 - .../mes/pcn/repository/MesStepParamRepository.java | 16 - .../pojo/mes/pcn/repository/MesStepRepository.java | 16 - .../pojo/mes/pcn/repository/MesTimeRepository.java | 10 - .../pcn/repository/MesTorqueDetailRepository.java | 17 - .../mes/pcn/repository/MesTypeCfgRepository.java | 14 - .../pcn/repository/MesWcCheckRecordRepository.java | 13 - .../mes/pcn/repository/MesWcCheckRepository.java | 13 - .../pcn/repository/MesWcEquipmentRepository.java | 13 - .../MesWorkCellMonitorLogRepository.java | 13 - .../repository/MesWorkCellParamCfgRepository.java | 16 - .../pcn/repository/MesWorkCellParamRepository.java | 16 - .../pcn/repository/MesWorkCellPointRepository.java | 17 - .../mes/pcn/repository/MesWorkCellRepository.java | 16 - .../repository/MesWorkCellStatusRepository.java | 16 - .../pcn/repository/MesWorkCenterRepository.java | 16 - .../pcn/repository/MesWorkOrderLogRepository.java | 16 - .../mes/pcn/repository/MesWorkOrderRepository.java | 16 - .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 411 --------------------- 239 files changed, 11363 deletions(-) delete mode 100644 modules/i3plus-pojo-mes-pcn/pom.xml delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml deleted file mode 100644 index 60d9861..0000000 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - i3plus-pojo - i3plus.pojo - 1.0-DEV-SNAPSHOT - ../../pom.xml - - 4.0.0 - - i3plus-pojo-mes-pcn - jar - - - - i3plus.pojo - i3plus-pojo-base - - - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${project.version} - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java deleted file mode 100644 index eb147e3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\14 19:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_DISMENTLE_RECORD") -@Api("物料拆解表") -public class IfDismantleRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -6010207359066736962L; - @Column(name = "DISMANTLE_ID") - @ApiParam("拆解编号") - private String dismantleId; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "PARENT_PART_NO") - @ApiParam("产品物料编码") - private String parentPartNo; - - @Column(name = "PARENT_PART_NAME") - @ApiParam("产品物料名称") - private String parentPartName; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Double qty; - - @Column(name = "DISMANTLE_QTY") - @ApiParam("拆解数") - private BigDecimal dismantleQty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子物料编码") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子物料名称") - private String itemPartName; - - @Column(name = "OK_QTY") - @ApiParam("合格数") - private BigDecimal okQty; - - @Column(name = "MISS_QTY") - @ApiParam("缺失数") - private BigDecimal missQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数") - private BigDecimal scrapQty; - - @Column(name = "LOT_NO") - @ApiParam("批次") - private String lotNo; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java deleted file mode 100644 index 651f8dc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 10:01 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PACKAGE_DETAIL") -@Api("包装明细表") -public class IfPackageDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = -1873101288426218272L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装条码") - private String packageNo; - - @Column(name = "LOT_NO") - @ApiParam("包装批次") - private String lotNo; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编号2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编号3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编号4") - private String packageNo4; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; - - @Column(name = "CT_NO") - @ApiParam("容器编号") - private String ctNo; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java deleted file mode 100644 index 367bb1c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java +++ /dev/null @@ -1,88 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 10:12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PRODUCT_OFF_LINE") -@Api("生产报工表") -public class IfProductOffLine extends BaseBean implements Serializable { - - private static final long serialVersionUID = 200629529131241418L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装条码") - private String packageNo; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "LOT_NO") - @ApiParam("生产批次") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批次") - private String fixLotNo; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java deleted file mode 100644 index ac19407..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION") -@Api("mes系统业务动作") -public class MesAction extends BaseBean implements Serializable { - private static final long serialVersionUID = -6451213228967727835L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "ACTION_NAME") - @ApiParam("动作名称") - private String actionName; - - @Column(name = "ACTION_TYPE") - @ApiParam("动作类型") - private Integer actionType; - - public int getActionTypeVal() { - return this.actionType == null ? 0 : this.actionType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java deleted file mode 100644 index eafb489..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\13 11:47 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_IF") -@Api("动作接口配置") -public class MesActionIf extends BaseBean implements Serializable { - - private static final long serialVersionUID = -5058215339453766620L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java deleted file mode 100644 index b38452f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作方法 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_METHOD") -@Api("系统业务动作方法") -public class MesActionMethod extends BaseBean implements Serializable { - private static final long serialVersionUID = 6249418690993577108L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "METHOD_CODE") - @ApiParam("方法代码") - private String methodCode; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java deleted file mode 100644 index d1910a3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description :生产区域 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_AREA") -@Api("生产区域") -public class MesArea extends BaseBean implements Serializable { - private static final long serialVersionUID = 1047604067591557689L; - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "AREA_NAME") - @ApiParam("区域名称") - private String areaName; - - @Transient - @ApiParam(value = "子集列表") - private List childTreeList; - - @Transient - @ApiParam(value = "名称") - private String name; - - // 默认值 -1 - @Transient - @ApiParam(value = "父节点", access = "父节点", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java deleted file mode 100644 index 7471095..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :BOM清单 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_BOM") -@Api("BOM清单") -public class MesBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -1772273641263268564L; - @Column(name = "PART_NO") - @ApiParam("父零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("父零件名称") - private String partName; - - @Column(name = "UNIT") - @ApiParam(value = "单位") - private String unit; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "数量", example = "0") - private Double qty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子零件") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子零件名称") - private String itemPartName; - - @Column(name = "ITEM_UNIT") - @ApiParam(value = "子零件单位") - private String itemUnit; - - @Column(name = "ITEM_QTY") - @ColumnDefault("0") - @ApiParam(value = "子零件数量", example = "0") - private Double itemQty; - - @Column(name = "BOM_VERSION") - @ApiParam(value = "BOM版本") - private String bomVersion; - - @Column(name = "EFF_START_TIME") - @ApiParam(value = "生效时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String effStartTime; - - @Column(name = "EFF_END_TIME") - @ApiParam(value = "失效时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String effEndTime; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getitemQtyVal() { - return this.itemQty == null ? 0.0d : this.itemQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java deleted file mode 100644 index fd9c366..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/16 0016 - 15:09 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CACHA_QUEUE") -@Api("MES缓存队列") -public class MesCachaQueue extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8272649623030195332L; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "CACHA_TYPE") - @ApiParam("缓存类型") - private String cachaType; - -} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java deleted file mode 100644 index 60e2d1d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; -import java.io.Serializable; - -/** - * @Description :工位投料信息 - * @Reference : - * @Author : Wynne.Lu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CELL_FEED") -@Api("工位投料信息") -public class MesCellFeed extends BaseBean implements Serializable { - private static final long serialVersionUID = 2412657464618960515L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("特殊批次") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public Integer lockVersion; - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java deleted file mode 100644 index 6464445..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java +++ /dev/null @@ -1,74 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工位投料履历信息 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2020-06-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CELL_FEED_RECORD") -@Api("工位投料履历信息") -public class MesCellFeedRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1947971379489107783L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("原材料数量") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java deleted file mode 100644 index f8b9558..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :配置表 - * @Reference : - * @Author : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CONFIG") -@Api("mes配置表") -public class MesConfig extends BaseBean implements Serializable { - private static final long serialVersionUID = -5759669472714287000L; - @Column(name = "CFG_CODE") - @ApiParam("配置代码") - private String cfgCode; - - @Column(name = "CFG_NAME") - @ApiParam("配置名称") - private String cfgName; - - @Column(name = "CFG_TYPE") - @ApiParam("配置类型") - private String cfgType; - - @Column(name = "CFG_KEY") - @ApiParam("配置key") - private String cfgKey; - - @Column(name = "CFG_VALUE") - @ApiParam("配置value") - private String cfgValue; - - @Column(name = "CFG_VAULE_DESC") - @ApiParam("配置value描述") - private String cfgValueDesc; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java deleted file mode 100644 index 8e9a363..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_PROD_LINE") -@Api("客户产线代码") -public class MesCustProdLine extends BaseBean implements Serializable { - private static final long serialVersionUID = 3049432665592161513L; - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "CUST_PROD_LINE_NAME") - @ApiParam("客户产线名称") - private String custProdLineName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java deleted file mode 100644 index 21f2ad1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes客户表 - * @Reference : - * @Author : crish - * @CreateDate : 2019-04-22 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUSTOMER") -@Api("客户信息") -public class MesCustomer extends BaseBean implements Serializable { - private static final long serialVersionUID = 167635887082538926L; - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "CUSTOMER_NAME") - @ApiParam("客户名称") - private String customerName; - - @Column(name = "BRIEF_TEXT") - @ApiParam("客户简称") - private String briefText; - - @Column(name = "ADDRESS") - @ApiParam("客户地址") - private String address; - - @Column(name = "CONTACT") - @ApiParam("客户联系人") - private String contact; - - @Column(name = "TELEPHONE") - @ApiParam("客户电话") - private String telephone; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java deleted file mode 100644 index 0c5f49c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes客户表 - * @Reference : - * @Author : yiming.gu - * @CreateDate : 2019-05-20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUSTOMER_PART") -@Api("客户零件关系") -public class MesCustomerPart extends BaseBean implements Serializable { - private static final long serialVersionUID = -4731252848471949263L; - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUSTOMER_PART_NO") - @ApiParam("客户零件号") - private String customerPartNo; - - @Column(name = "CUSTOMER_PART_NAME") - @ApiParam("客户零件描述") - private String customerPartName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java deleted file mode 100644 index 8bded7d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:12 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DATA_OBJECT") -@Api("数据对象") -public class MesDataObject extends BaseBean implements Serializable { - - private static final long serialVersionUID = -1419262751765770535L; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Column(name = "FIELD_PK") - @ApiParam("主键") - private String fieldPk; - - @Column(name = "READ_FLAG_VALUE") - @ApiParam("读取标志值") - private String readFlagValue; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "SELF_ADDITION") - @ApiParam("自增列") - private String selfAddition; - - @Column(name = "SELF_ADDITION_VALUE") - @ApiParam("自增列值") - private Long selfAdditionValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java deleted file mode 100644 index 93ea185..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:17 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DATASOURCE") -@Api("地址清单") -public class MesDatasource extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7387559860198655900L; - @Column(name = "DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name = "DS_NAME") - @ApiParam("数据源名称") - private String dsName; - - @Column(name = "DS_TYPE") - @ApiParam("数据源类型") - private String dsType; - - @Column(name = "DS_HOST") - @ApiParam("主机") - private String dsHost; - - @Column(name = "DS_PORT") - @ApiParam("端口") - private Integer dsPort; - - @Column(name = "DS_USER") - @ApiParam("用户名") - private String dsUser; - - @Column(name = "DS_PASSWORD") - @ApiParam("密码") - private String dsPassword; - - @Column(name = "DS_DB_NAME") - @ApiParam("数据库名称") - private String dsDbName; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Override - public String toString() { - return "MesDatasource{" + - "dsCode='" + dsCode + '\'' + - ", dsName='" + dsName + '\'' + - ", dsType='" + dsType + '\'' + - ", dsHost='" + dsHost + '\'' + - ", dsPort=" + dsPort + - ", dsUser='" + dsUser + '\'' + - ", dsPassword='" + dsPassword + '\'' + - ", dsDbName='" + dsDbName + '\'' + - ", equipmentCode='" + equipmentCode + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java deleted file mode 100644 index bed31e1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT") -@Api("缺陷表") -public class MesDefect extends BaseBean implements Serializable { - - private static final long serialVersionUID = -6771813937279359333L; - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "DEFECT_TYPE") - @ApiParam("缺陷类型") - private String defectType; - - @Column(name = "PROD_CFG_TYPE_CODE") - @ApiParam("项目代码") - private String prodCfgTypeCode; - - @Column(name = "DEFECT_FLAG_VALUE") - @ApiParam("缺陷标识值") - private String defectFlagValue; - - @Column(name = "DEFECT_ACTION_TYPE") - @ApiParam("不良处理类型") - private String defectActionType; - - @Transient - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @Transient - @ApiParam("缺陷位置") - private String defectLocation; - - @Transient - @ApiParam("缺陷类型子集") - private List mesDefectList; - public MesDefect() { - - } - - public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) { - this.defectCode = defectCode; - this.defectName = defectName; - this.defectType = defectType; - this.defectTypeName = defectTypeName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java deleted file mode 100644 index d4f287f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_CAUSE") -@Api("缺陷原因表") -public class MesDefectCause extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3867250593038812861L; - @Column(name = "DC_CODE") - @ApiParam("缺陷原因代码") - private String dcCode; - - @Column(name = "DC_NAME") - @ApiParam("缺陷原因名称") - private String dcName; - - @Column(name = "DC_TYPE") - @ApiParam("缺陷原因类型") - private String dcType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java deleted file mode 100644 index a97ccef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 19:53 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("不良信息记录表") -public class MesDefectRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2828208776424343584L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "DEFECT_LOCATION") - @ApiParam("缺陷位置") - private String defectLocation; - - @Column(name = "SIDE_LOCATION") - @ApiParam("面位") - private String sideLocation; - - @Column(name = "REPAIR_STATUS") - @ApiParam("维修状态") - private Integer repairStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Transient - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java deleted file mode 100644 index 14151ff..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.math.BigDecimal; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 15:03 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD", indexes = { - @Index(columnList = "SN"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("物料拆解记录表") -public class MesDismantleRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7924346039878218038L; - @Column(name = "DISMANTLE_ID") - @ApiParam("拆解编号") - private String dismantleId; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "PARENT_PART_NO") - @ApiParam("产品物料编码") - private String parentPartNo; - - @Column(name = "PARENT_PART_NAME") - @ApiParam("产品物料名称") - private String parentPartName; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Double qty; - - @Column(name = "DISMANTLE_QTY") - @ApiParam("拆解数") - private BigDecimal dismantleQty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子物料编码") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子物料名称") - private String itemPartName; - - @Column(name = "OK_QTY") - @ApiParam("合格数") - private BigDecimal okQty; - - @Column(name = "MISS_QTY") - @ApiParam("缺失数") - private BigDecimal missQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数") - private BigDecimal scrapQty; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Transient - private String serialNumber; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java deleted file mode 100644 index 25fe6ee..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2020/9/23 18:47 - * @desc - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_ALARM_RECORD", indexes = { - @Index(columnList = "WORK_CENTER_CODE") -}) -@Api("设备自动报警记录表") -public class MesEquAlarmRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1675134362612851879L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "ALARM_LEVEL") - @ApiParam("报警等级") - private Integer alarmLevel; - - @Column(name = "ALARM_START_TIME") - @ApiParam("报警开始时间") - private String alarmStartTime; - - @Column(name = "ALARM_STOP_TIME") - @ApiParam("报警开始时间") - private String alarmStopTime; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java deleted file mode 100644 index df432f3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :生产设备 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQUIPMENT") -@Api("生产设备") -public class MesEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 7269069290035250108L; - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Column(name = "EQUIPMENT_NAME") - @ApiParam("设备名称") - private String equipmentName; - - @Column(name = "STATUS") - @ApiParam("设备状态") - private Integer status; - - @Column(name = "EQUIPMENT_TYPE") - @ApiParam("设备类型") - private Integer equipmentType; - - @Column(name = "EQUIPMENT_CATEGORY") - @ApiParam("设备类别") - private String equipmentCategory; - - @Column(name = "EQUIPMENT_MODEL") - @ApiParam("型号") - private String equipmentModel; - - @Column(name = "EQUIPMENT_SPEC") - @ApiParam("规格") - private String equipmentSpec; - - @Column(name = "EQUIPMENT_MAKER") - @ApiParam("制造商") - private String equipmentMaker; - - @Column(name = "RELEASE_DATE") - @ApiParam("出厂日期") - private String releaseDate; - - @Column(name = "RECEIVE_DATE") - @ApiParam("接收日期") - private String receiveDate; - - @Column(name = "ENABLE_DATE") - @ApiParam("启用日期") - private String enableDate; - - @Column(name = "CONNECT_TYPE") - @ApiParam("连接类型") - private Integer connectType; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Transient - @ApiParam(value = "名称") - private String name; - - // 默认值 -1 - @Transient - @ApiParam(value = "父节点", access = "父节点", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java deleted file mode 100644 index 655c2f4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java +++ /dev/null @@ -1,93 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/7/30 9:30 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ESOP") -@Api("作业指导书信息表(ODS)") -public class MesEsop extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4869646502033099294L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步序号") - private Integer stepSeq; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - - @Transient - @ApiParam("文件名称") - private String fileName; - - @Transient - @ApiParam("文件URL") - private String fileUrl; - - @Transient - @ApiParam("组名") - private String groupName; - - @Transient - @ApiParam("文件原名") - private String fileOriginName; - - @Transient - @ApiParam("文件大小") - private String fileSize; - - @Transient - @ApiParam("文件类型名称") - private String fileType; - - @Transient - @ApiParam("同步标记") - private Integer syncTag = 0; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java deleted file mode 100644 index cc17b50..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务事件 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EVENT") -@Api("系统业务事件") -public class MesEvent extends BaseBean implements Serializable { - private static final long serialVersionUID = -5604724665202938464L; - @Column(name = "EVENT_CODE") - @ApiParam("事件代码") - private String eventCode; - - @Column(name = "EVENT_NAME") - @ApiParam("事件名称") - private String eventName; - - @Column(name = "EVENT_TYPE") - @ApiParam("事件类型") - private Integer eventType; - - @Column(name = "BUTTON_CODE") - @ApiParam("按钮代码") - private String buttonCode; - - public int getEventTypeVal() { - return this.eventType == null ? 0 : this.eventType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java deleted file mode 100644 index 2a16eb0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务事件动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EVENT_ACTION") -@Api("系统业务事件动作") -public class MesEventAction extends BaseBean implements Serializable { - private static final long serialVersionUID = 3964084375279916831L; - @Column(name = "EVENT_CODE") - @ApiParam("事件代码") - private String eventCode; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java deleted file mode 100644 index f128453..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/10 8:37 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_FI_CFG") -@Api("首检件配置") -public class MesFiCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1791614973371037158L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java deleted file mode 100644 index a90ed92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/12/4 1:28 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_FILE") -@Api("文件表") -public class MesFile extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7017379708394714424L; - @Column(name = "FILE_NAME") - @ApiParam("文件名称") - private String fileName; - - @Column(name = "FILE_URL") - @ApiParam("文件URL") - private String fileUrl; - - @Column(name = "GROUP_NAME") - @ApiParam("组名") - private String groupName; - - @Column(name = "FILE_ORIGIN_NAME") - @ApiParam("文件原名") - private String fileOriginName; - - @Column(name = "FILE_SIZE") - @ApiParam("文件大小") - private String fileSize; - - @Column(name = "FILE_TYPE") - @ApiParam("文件类型名称") - private String fileType; - - @Column(name = "SYNC_TAG") - @ApiParam("同步标记") - private Integer syncTag = 0; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java deleted file mode 100644 index 243e6a9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java +++ /dev/null @@ -1,65 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :物料关键数据 - * @Reference : - * @Author : crish - * @CreateDate : 2019-05-15 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_KP_DATA") -@Api("生产区域") -public class MesKpData extends BaseBean implements Serializable { - private static final long serialVersionUID = -3332582267186642790L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "KEY_DATA_CODE") - @ApiParam("关键数据代码") - private String keyDataCode; - - @Column(name = "KEY_DATA_NAME") - @ApiParam("关键数据名称") - private String keyDataName; - - @Column(name = "KEY_DATA_COUNT") - @ApiParam("关键数据数量") - private Integer keyDataCount; - - @Column(name = "UPPER_LIMIT") - @ApiParam("数据上限") - private Double upperLimit; - - @Column(name = "LOWER_LIMIT") - @ApiParam("数据下限") - private Double lowerLimit; - - @Transient - @ApiParam("扭矩值") - private Double torqueValue; - - @Transient - @ApiParam("是否在范围之内") - private Boolean ok; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java deleted file mode 100644 index 9ca9ac7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java +++ /dev/null @@ -1,95 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_KPSN_RULE") -@Api("关键件条码校验规则") -public class MesKpsnRule extends BaseBean implements Serializable { - private static final long serialVersionUID = 8238308232531730720L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "LENGTH") - @ApiParam("长度") - private Integer length; - - @Column(name = "FROM1") - @ApiParam("起始1") - private Integer from1; - - @Column(name = "TO1") - @ApiParam("至1") - private Integer to1; - - @Column(name = "FIX1") - @ApiParam("内容1") - private String fix1; - - @Column(name = "FROM2") - @ApiParam("起始2") - private Integer from2; - - @Column(name = "TO2") - @ApiParam("至2") - private Integer to2; - - @Column(name = "FIX2") - @ApiParam("内容2") - private String fix2; - - @Column(name = "TYPE") - @ApiParam("类型") - private String type; - - @Column(name = "BIND_RULE") - @ApiParam("绑定规则") - private Integer bandRule; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - public int getLengthVal() { - return this.length == null ? 0 : this.length; - } - - public int getFrom1Val() { - return this.from1 == null ? 0 : this.from1; - } - - public int getTo1Val() { - return this.to1 == null ? 0 : this.to1; - } - - public int getFrom2Val() { - return this.from2 == null ? 0 : this.from2; - } - - public int getTo2Val() { - return this.to2 == null ? 0 : this.to2; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java deleted file mode 100644 index 589c237..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.util.List; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-18 11:00 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_LABEL_TEMPLATE") -@Api(value = "打印模板", description = "打印模板") -public class MesLabelTemplate extends BaseBean implements Serializable { - - - private static final long serialVersionUID = 3797103812377146878L; - @Column(name = "TEMPLATE_CODE") - @ApiParam(value = "模板代码") - private String templateCode; - - @Column(name = "TEMPLATE_NAME") - @ApiParam(value = "模板名称") - private String templateName; - - @Lob - @Column(name = "TEMPLATE_CONTENT") - @ApiParam(value = "模板内容") - private String templateContent; - - // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value = "模板参数拼接") - @Transient - private String paramsPack; - - @Transient - @ApiParam(value = "模板id对应的模板参数") - private List labelTemplateParamList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java deleted file mode 100644 index 253f29a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.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 : crish - * @CreateDate : 2019-08-18 11:00 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_LABEL_TEMPLATE_PARAM") -@Api(value = "打印模板参数", description = "打印模板参数") -public class MesLabelTemplateParam extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3595706874099358555L; - @Column(name = "TEMPLATE_ID") - @ApiParam(value = "模板ID", access = "模板ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name = "TEMPLATE_CODE") - @ApiParam(value = "模板代码") - private String templateCode; - - @Column(name = "TEMPLATE_PARAM") - @ApiParam(value = "模板参数") - private String templateParam; - - @Lob - @Column(name = "TEMPLATE_PARAM_TEXT") - @ApiParam(value = "模板参数描述") - private String templateParamText; - - // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value = "模板参数值") - @Transient - private String templateParamValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java deleted file mode 100644 index e8daace..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务方法 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_METHOD") -@Api("系统业务方法") -public class MesMethod extends BaseBean implements Serializable { - private static final long serialVersionUID = -3629909409034083767L; - @Column(name = "METHOD_CODE") - @ApiParam("方法代码") - private String methodCode; - - @Column(name = "METHOD_NAME") - @ApiParam("方法名称") - private String methodName; - - @Column(name = "CALL_CLASS") - @ApiParam("具体实现类") - private String callClass; - - /** - * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） - */ - @Column(name = "METHOD_TYPE") - @ApiParam("方法类型") - private Integer methodType; - - public int getMethodTypeVal() { - return this.methodType == null ? 0 : this.methodType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java deleted file mode 100644 index 3e81c47..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 17:11 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_MONITOR_TASK") -@Api("监听任务") -public class MesMonitorTask extends BaseBean implements Serializable { - - private static final long serialVersionUID = -8614480099840448294L; - @Column(name = "TASK_NO") - @ApiParam("任务编号") - private String taskNo; - - @Column(name = "TASK_NAME") - @ApiParam("任务名称") - private String taskName; - - @Column(name = "TASK_OBJECT_TYPE") - @ApiParam("任务对象类型") - private Integer taskObjectType; - - @Column(name = "TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - - @Column(name = "TASK_EXCEPTION_DESC") - @ApiParam("异常描述") - private String taskExceptionDesc; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java deleted file mode 100644 index 891dc65..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 17:19 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_MONITOR_TASK_DETAIL") -@Api("监听任务明细") -public class MesMonitorTaskDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4811270359386960747L; - @Column(name = "TASK_NO") - @ApiParam("任务编号") - private String taskNo; - - @Column(name = "DATA_OBJECT_NO") - @ApiParam("数据对象编号") - private String dataObjectNo; - -// @Column(name = "STORE_OBJECT_CODE") -// @ApiParam("存储对象代码") -// private String storeObjectCode; -// -// @Column(name = "STORE_FIELD_CODE") -// @ApiParam("存储字段代码") -// private String storeFieldCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java deleted file mode 100644 index 9fc51c2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/22 5:59 PM - * @Description: - **/ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_NUMBER_RULE") -@Api("条码生成规则") -public class MesNumberRule extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4039194855353751178L; - @Column(name = "RULE_CODE") - @ApiParam("规则代码") - private String ruleCode; - - @Column(name = "RULE_DESC") - @ApiParam("规则描述") - private String ruleDesc; - - @Column(name = "PREFIX") - @ApiParam("前缀") - private String prefix; - - @Column(name = "NUMBER_RULE") - @ApiParam("编码规则") - private String numberRule; - - @Column(name = "SERIALNO_LENGTH") - @ApiParam("序号长度") - private Integer serialnoLength; - - @Column(name = "SERIALNO_INCREMENT") - @ApiParam("增量") - private Integer serialnoIncrement; - - @Column(name = "IS_CYCLE") - @ApiParam("最大值后循环") - private Integer isCycle; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java deleted file mode 100644 index 16436c6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 9:14 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_NUMBER_SERIALNO") -@Api("编码序号") -public class MesNumberSerialno extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3024166851634742872L; - @Column(name = "CURRENT_NUMBER_PREFIX") - @ApiParam("当前编号前缀") - private String currentNumberPrefix; - - @Column(name = "CURRENT_SERIALNO") - @ApiParam("当前序号") - private Integer currentSerialno; - - @Column(name = "CURRENT_NUMBER") - @ApiParam("当前编号") - private String currentNumber; - - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java deleted file mode 100644 index 5b7c166..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:14 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_OBJECT_CFG") -@Api("对象结构") -public class MesObjectCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3640782210450491835L; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "FIELD_CODE") - @ApiParam("字段代码") - private String fieldCode; - - @Column(name = "FIELD_NAME") - @ApiParam("字段名称") - private String fieldName; - - @Column(name = "FIELD_TYPE") - @ApiParam("字段类型") - private String fieldType; - - @Column(name = "FIELD_LENGTH") - @ApiParam("列长度") - private Integer fieldLength; - - @Column(name = "POJO_ATTR") - @ApiParam("对应的pojo属性") - private String pojoAttr; - - @Column(name = "IS_SAVE") - @ApiParam("是否保存 1存 2不存") - private Integer isSave; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java deleted file mode 100644 index 38c0363..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :PLC设备信息配置表 - * @Reference : - * @Author : Crish - * @CreateDate : 2019-05-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC_CONFIGURE") -@Api("PLC设备信息配置表") -@Deprecated -public class MesPLCConfigure extends BaseBean implements Serializable { - private static final long serialVersionUID = 8274445475806774L; - @Column(name = "IP") - @ApiParam("设备ip") - private String ipAddress; - - @Column(name = "CHANNEL_NAME") - @ApiParam("通道名称") - private String channelName; - - @Column(name = "DEVICE_NAME") - @ApiParam("设备地址") - private String deviceName; - - @Column(name = "TAG_NAME") - @ApiParam("标签地址") - private String tagName; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java deleted file mode 100644 index 7ca973d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :包装规格 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACK_SPEC") -@Api("包装规格") -public class MesPackSpec extends BaseBean implements Serializable { - private static final long serialVersionUID = -788654193624068327L; - @Column(name = "SPEC_CODE") - @ApiParam("包装规格代码") - private String specCode; - - @Column(name = "SPEC_NAME") - @ApiParam("包装规格名称") - private String specName; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "包装数量", example = "0") - private Double qty; - - @Column(name = "QTY2") - @ColumnDefault("0") - @ApiParam(value = "包装数量2", example = "0") - private Double qty2; - - @Column(name = "QTY3") - @ColumnDefault("0") - @ApiParam(value = "包装数量3", example = "0") - private Double qty3; - - @Column(name = "QTY4") - @ColumnDefault("0") - @ApiParam(value = "包装数量4", example = "0") - private Double qty4; - - @Column(name = "IS_MIXED") - @ApiParam("是否混包") - private Integer isMixed; - - @Column(name = "IS_MIXED2") - @ApiParam("是否混包2") - private Integer isMixed2; - - @Column(name = "IS_MIXED3") - @ApiParam("是否混包3") - private Integer isMixed3; - - @Column(name = "IS_MIXED4") - @ApiParam("是否混包4") - private Integer isMixed4; - - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getIsMixedVal() { - return this.isMixed == null ? 0 : this.isMixed; - } - - public int getIsMixed2Val() { - return this.isMixed2 == null ? 0 : this.isMixed2; - } - - public int getIsMixed3Val() { - return this.isMixed3 == null ? 0 : this.isMixed3; - } - - public int getIsMixed4Val() { - return this.isMixed4 == null ? 0 : this.isMixed4; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java deleted file mode 100644 index 6c1beda..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ /dev/null @@ -1,119 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 1:26 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) - } -) -@Api("包装规格") -public class MesPackage extends BaseBean implements Serializable { - private static final long serialVersionUID = 2292859018089339608L; - @Column(name = "PACKAGE_NO", nullable = false) - @ApiParam("包装编号") - private String packageNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "PACK_SPEC_QTY") - @ApiParam("包装规格数量") - private Double packSpecQty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "LOT_NO") - @ApiParam("批号") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批号") - private String fixLotNo; - - @Column(name = "PACK_SPEC") - @ApiParam("包装规格") - private String packSpec; - - @Column(name = "IS_SEALED") - @ApiParam("是否封箱") - private Integer isSealed; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态10：未打印 20：已打印") - private Integer printStatus; - - @Column(name = "PACK_LEVEL") - @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") - private Integer packLevel; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Transient - @ApiParam("封箱状态") - private String sealStatus; - - @Transient - @ApiParam("打印状态文字") - private String printStrStatus; - - @Transient - @ApiParam("打印缓存id") - private String printId; - - public MesPackage() { - } - - public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { - this.packageNo = packageNo; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.qty = qty; - this.packSpecQty = packSpecQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java deleted file mode 100644 index a987364..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 2:55 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) -} -) -@Api("包装规格明细") -public class MesPackageDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8162606304720621672L; - @Column(name = "PACKAGE_NO", nullable = false) - @ApiParam("包装编码") - private String packageNo; - - @Column(name = "SERIAL_NUMBER", nullable = false) - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("物料编号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编码2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编码3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编码4") - private String packageNo4; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java deleted file mode 100644 index 72084e3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 3:23 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) -@Api("包装履历表") -public class MesPackageTravel extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2808747095415676213L; - @Column(name = "PACKAGE_NO") - @ApiParam("包装编码") - private String packageNo; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "OP_TYPE") - @ApiParam("操作类型") - private Integer opType; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编码2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编码3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编码4") - private String packageNo4; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java deleted file mode 100644 index 81365ef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ /dev/null @@ -1,93 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :物料信息 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART") -@Api("物料信息") -public class MesPart extends BaseBean implements Serializable { - private static final long serialVersionUID = 3936033255397936854L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("零件名称") - private String partName; - - @Column(name = "BRIEF_TEXT") - @ApiParam("零件简称") - private String briefText; - - @Column(name = "PART_SPEC") - @ApiParam("零件规格") - private String partSpec; - - @Column(name = "CATEGORY_CODE1") - @ApiParam("分类1") - private String categoryCode1; - - @Column(name = "CATEGORY_CODE2") - @ApiParam("分类2") - private String categoryCode2; - - @Column(name = "CATEGORY_CODE3") - @ApiParam("分类3") - private String categoryCode3; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "PACK_SPEC_CODE") - @ApiParam("包装规格代码") - private String packSpecCode; - - @Column(name = "DEFAULT_WORK_CENTER") - @ApiParam("默认工作中心") - private String defaultWorkCenter; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PROCESS_MATCH_TYPE") - @ApiParam("过程编码匹配类型") - private Integer processMatchType; - - @Column(name = "PACKAGE_MATCH_TYPE") - @ApiParam("包装编码匹配类型") - private Integer packageMatchType; - - @Column(name = "PRODUCT_MATCH_TYPE") - @ApiParam("产品编码匹配类型") - private Integer productMatchType; - - @Transient - @ApiParam("分类名称") - private String categoryName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java deleted file mode 100644 index 949a02f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :零件种类 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART_CATEGORY") -@Api("零件种类") -public class MesPartCategory extends BaseBean implements Serializable { - private static final long serialVersionUID = 9076081904146489470L; - @Column(name = "CATEGORY_CODE") - @ApiParam("分类代码") - private String categoryCode; - - @Column(name = "CATEGORY_NAME") - @ApiParam("分类名称") - private String categoryName; - - @Column(name = "CATEGORY_TYPE") - @ApiParam("分类类型") - private String categoryType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java deleted file mode 100644 index 94f495f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/16 0016 - 15:50 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART_FORMULA") -@Api("MES_物料配方") -public class MesPartFormula extends BaseBean implements Serializable { - - private static final long serialVersionUID = 3120650997069271308L; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "FORMULA_CONTENT") - @ApiParam("配方内容") - private String formulaContent; - - @Column(name = "FORMULA_TYPE") - @ApiParam("配方类型") - private Integer formulaType; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java deleted file mode 100644 index 9c8adca..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :JIS发运模式 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PATTERN_JIS") -@Api("JIS发运模式") -public class MesPatternJis extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1119289554542499312L; - @Column(name = "PATTERN_NO") - @ApiParam("模式编号") - private String patternNo; - - @Column(name = "PATTERN_NAME") - @ApiParam("模式名称") - private String patternName; - - @Column(name = "QUEUE_NO") - @ApiParam("显示主队列数") - private Integer queueNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; - - @Column(name = "PATTERN_DESC") - @ApiParam("描述") - private String patternDesc; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型组") - private String produceCategoryCode; - - @Column(name = "PATTERN_TYPE") - @ApiParam("模式类型") - private Integer patternType; - - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java deleted file mode 100644 index c19bfa3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN") -@Api("PCN节点") -public class MesPcn extends BaseBean implements Serializable { - private static final long serialVersionUID = -7570827672640277097L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "PCN_NAME") - @ApiParam("PCN名称") - private String pcnName; - - @Column(name = "AREA_CODE") - @ApiParam("区域") - private String areaCode; - - @Column(name = "AREA_NAME") - @ApiParam("区域名称") - private String areaName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "PCN_VERSION") - @ApiParam("PCN版本") - private String pcnVersion; - - @Column(name = "CONNECT_IP") - @ApiParam("连接IP") - private String connectIp; - - @Column(name = "CONNECT_COUNT") - @ApiParam("连接次数") - private Integer connectCount; - - @Column(name = "IS_CONNECT") - @ApiParam("是否连接") - private Integer isConnect; - - @Column(name = "CONNECT_TIME") - @ApiParam("连接时间") - private String connectTime; - - @Column(name = "CODE_SPECIFIC") - @ApiParam("PCN特殊字段") - private String codeSpecific; - - public int getConnectCountVal() { - return this.connectCount == null ? 0 : this.connectCount; - } - - public int getIsConnectVal() { - return this.isConnect == null ? 0 : this.isConnect; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java deleted file mode 100644 index faa7f92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_CONNECT_LOG") -@Api("PCN节点连接日志") -public class MesPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -4153357131289178766L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "PCN_NAME") - @ApiParam("PCN名称") - private String pcnName; - - @Column(name = "PCN_VERSION") - @ApiParam("PCN版本") - private String pcnVersion; - - @Column(name = "CONNECT_IP") - @ApiParam("连接IP") - private String connectIp; - - @Column(name = "IS_CONNECT") - @ApiParam("是否连接") - private Integer isConnect; - - @Column(name = "REMARK") - @ApiParam("备注") - private String Remark; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java deleted file mode 100644 index 4d321f8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java +++ /dev/null @@ -1,92 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYNC_CFG") -@Api("MES_PCN_同步配置") -public class MesPcnSyncCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -6869288362923390521L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "OBJECT_KEY") - @ApiParam("对象主键") - private String objectKey; - - @Column(name = "SYNC_FREQUENCY") - @ApiParam("同步频率") - private Integer syncFrequency; - - @Column(name = "SYNC_TIME") - @ApiParam(value = "同步时间") - private String syncTime; - - @Column(name = "SYNC_PATTERN") - @ApiParam("同步方式 2.新增 1.修改") - private Integer syncPattern; - - @Column(name = "SYNC_TYPE") - @ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes") - private Integer syncType; - - @Column(name = "LAST_SYNC_TIME") - @ApiParam(value = "上一同步时间") - private String lastSyncTime; - - @Column(name = "EXTRACT_GAP") - @ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制") - private Integer extractGap; - - @Column(name = "EXTRACT_CONDITION") - @ApiParam(value = "从数据库抽取的条件限制") - private String extractCondition; - - @Column(name = "IS_IGNORE_ORG") - @ApiParam(value = "同步的时候是否区分工厂") - private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); - - public int getSyncFrequencyVal() { - return this.syncFrequency == null ? 0 : this.syncFrequency; - } - - public int getSyncTypeVal() { - return this.syncType == null ? 0 : this.syncType; - } - - public int getSyncPatternVal() { - return this.syncPattern == null ? 0 : this.syncPattern; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java deleted file mode 100644 index 22810be..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYNC_ERRORLOG") -@Api("MES_PCN同步异常日志") -public class MesPcnSyncErrorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -2249754641660006488L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "ERROR_SPOT") - @ApiParam("异常位置") - private String errorSpot; - - @Lob - @Column(name = "ERROR_CONTENT") - @ApiParam("异常内容") - private String errorContent; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java deleted file mode 100644 index 78d3caa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ /dev/null @@ -1,70 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.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; -import java.util.List; - -/** - * @Description : 账号离线登陆表 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-09-01 11:02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYS_USER_OFFLINE") -@Api(value = "账号离线登陆表", description = "账号离线登陆表。") -public class MesPcnSysUserOffline extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7617353154826718154L; - @Column(name = "USER_ID") - @ApiParam(value = "人员ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long userId; - - @Column(name = "USER_CODE") - @ApiParam(value = "用户编号", access = "用户编号") - private String userCode; - - @Column(name = "USER_NAME") - @ApiParam(value = "用户名称", access = "账号名称") - private String userName; - - @Column(name = "LOGIN_NAME") - @ApiParam(value = "登陆名称", access = "登陆名称") - private String loginName; - - @Column(name="USER_TYPE") - @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") - private Integer userType; - - @Lob - @Column(name="LOGIN_INFO") - @ApiParam(value ="登陆信息" , access ="登陆信息") - private String loginInfo; - - @Lob - @Column(name="MENU_LIST") - @ApiParam(value ="菜单" , access ="菜单") - private String menuList; - - @Lob - @Column(name="MODULE_LIST") - @ApiParam(value ="模块" , access ="模块") - private String moduleList; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java deleted file mode 100644 index 8288401..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes-pcn定时任务工作清单 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-26 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_TASK") -@Api("mes-pcn定时任务工作清单") -public class MesPcnTask extends BaseBean implements Serializable { - - private static final long serialVersionUID = 4777357978430670966L; - @Column(name = "TASK_CODE") - @ApiParam("任务代码") - private String taskCode; - - @Column(name = "TASK_NAME") - @ApiParam("任务名称") - private String taskName; - - @Column(name = "TASK_GROUP_NAME") - @ApiParam("任务组名称") - private String taskGroupName; - - @Column(name = "TASK_DESCRIPTION") - @ApiParam("任务描述") - private String taskDescription; - - @Column(name = "TASK_TYPE") - @ApiParam("任务类型") - private Integer taskType; - - @Column(name = "TASK_MODULE") - @ApiParam("任务模块") - private String taskModule; - - @Column(name = "TASK_CLASS") - @ApiParam("任务类名") - private String taskClass; - - @Column(name = "TASK_PACKAGE") - @ApiParam("任务包名") - private String taskPackage; - - @Column(name = "PCN_NAME") - @ApiParam("PCN节点名称") - private String pcnName; - - @Column(name = "PCN_CODE") - @ApiParam("PCN节点名称代码") - private String pcnCode; - - @Column(name = "TASK_CYCLE_EXPS") - @ApiParam("任务周期表达式") - private String taskCycleExps; - - @Column(name = "TASK_CYCLE_DESCRIPTION") - @ApiParam("任务周期描述") - private String taskCycleDescription; - - @Column(name = "TASK_PARAM") - @ApiParam("任务参数") - private String taskParam; - - public int getTaskTypeVal() { - return this.taskType == null ? 0 : this.taskType; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java deleted file mode 100644 index f0ee69f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes-pcn定时任务工作清单同步记录 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-27 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_TASK_LOG") -@Api("mes-pcn定时任务工作清单同步记录") -public class MesPcnTaskLog extends BaseBean implements Serializable { - - private static final long serialVersionUID = -784806389462540310L; - @Column(name = "SYNC_TIME_START") - @ApiParam("同步数据开始时间") - private String syncTimeStart; - - @Column(name = "SYNC_TIME_END") - @ApiParam("同步数据截止时间") - private String syncTimeEnd; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_CONTENT") - @ApiParam("异常内容") - private Long errorContent; - - public int getSyncStatusVal() { - return this.syncStatus == null ? 0 : this.syncStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java deleted file mode 100644 index bb60da6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ /dev/null @@ -1,144 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; -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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) - } -) -@Api("生产主计划") -public class MesPlanOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 8571104279843276872L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("生产计划单号") - private String orderNo; - - @Column(name = "PO_TYPE") - @ApiParam("计划类型") - private Integer planType; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PLAN_QTY") - @ApiParam("计划数量") - private Double planQty; - - @Column(name = "DECOMPOSE_QTY") - @ApiParam("分解数量") - private Double decomposeQty; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam("计划开始时间") - private String startTime; - - @Column(name = "END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam("计划结束时间") - private String endTime; - - @Column(name = "DELIVERY_DATE") - @ApiParam("交货日期") - private String deliveryDate; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "SOURCE") - @ApiParam("计划来源") - private String source; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - /********************** 冗余字段 *********************************/ - - @Transient - @ApiParam(value = "区域") - public String areaCode; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - public double getPlanQtyVal() { - return this.planQty == null ? 0.0d : this.planQty; - } - - public double getDecomposeQtyVal() { - return this.decomposeQty == null ? 0.0d : this.decomposeQty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public int getPlanTypeVal() { - return this.planType == null ? 0 : this.planType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java deleted file mode 100644 index 5d5a48c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ /dev/null @@ -1,112 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/25 8:07 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC") -@Api("PLC配置表") -public class MesPlc extends BaseBean implements Serializable { - - private static final long serialVersionUID = -5346536604317095818L; - @Column(name = "PLC_CODE") - @ApiParam("PLC代码") - private String plcCode; - - @Column(name = "PLC_NAME") - @ApiParam("PLC名称") - private String plcName; - - @Column(name = "PLC_MODEL") - @ApiParam("PLC型号") - private String plcModel; - - @Column(name = "PLC_IP") - @ApiParam("PLC IP") - private String plcIp; - - @Column(name = "CHANNEL") - @ApiParam("通道") - private String channel; - - @Column(name = "TAG_NAME") - @ApiParam("标签名称") - private String tagName; - - @Column(name = "TAG_ADDRESS") - @ApiParam("标签地址") - private String tagAddress; - - @Column(name = "DATA_TYPE") - @ApiParam("标签数据类型") - private String dataType; - - @Column(name = "GROUP_NAME") - @ApiParam("分组名称") - private String groupName; - - @Column(name = "DEVICE") - @ApiParam("驱动") - private String device; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "PLC_CFG") - @ApiParam("PLC的值的设定") - private String plcCfg; - - @Column(name = "ANALYSIS_RULE") - @ApiParam("解析规则") - private String analysisRule; - - @Column(name = "IS_ANALYSIS") - @ApiParam("是否解析") - private String isAnalysis; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Transient - @ApiParam("设备名称") - private String equipmentName; - - @Column(name = "TOOLING_CODE ") - @ApiParam("工装代码") - private String toolingCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java deleted file mode 100644 index 752400b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工序 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROCESS") -@Api("工序") -public class MesProcess extends BaseBean implements Serializable { - private static final long serialVersionUID = -2619648674238082872L; - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "PROCESS_NAME") - @ApiParam("工序名称") - private String processName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java deleted file mode 100644 index 8114387..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ /dev/null @@ -1,106 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Description :产品绑定记录表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "KP_SN") -}) -@Api("产品绑定记录表") -public class MesProdBindRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -4319604821328717354L; - @Column(name = "SERIAL_NUMBER") - @ApiParam(value = "产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品条码零件号") - private String partNo; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单号") - private String workOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元") - private String workCellCode; - - @Column(name = "STEP_CODE") - @ApiParam(value = "工步代码") - private String stepCode; - - @Column(name = "ITEM_PART_NO") - @ApiParam("原材料零件号") - private String itemPartNo; - - @Column(name = "KP_SN") - @ApiParam("原材料条码") - private String kpSn; - - @Column(name = "KP_QTY") - @ColumnDefault("0") - @ApiParam(value = "原材料数量", example = "0") - private Double kpQty; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商") - private String supplierCode; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "IS_FEED") - @ApiParam("是否投料配置") - private Integer isFeed; - - @Column(name = "VERSION") - @ApiParam("版本") - private String version; - - @Column(name = "RESULT") - @ApiParam(value = "结果") - private String result; - - @Column(name = "is_BIND_KEY") - @ApiParam(value = "是否绑定关键件") - private Integer isBindKey; - - @Column(name = "ACTION_TYPE") - @ApiParam(value = "动作类型") - private Integer actionType; - - public int getIsFeedVal() { - return this.isFeed == null ? 0 : this.isFeed; - } - - public double getQtyVal() { - return this.kpQty == null ? 0.0d : this.kpQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java deleted file mode 100644 index 4ff20da..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :产品配置 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_CFG") -@Api("产品配置") -public class MesProdCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7487874316722319947L; - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PROD_CFG_NAME") - @ApiParam("产品配置名称") - private String prodCfgName; - - @Column(name = "PROD_CFG_Type_CODE") - @ApiParam("产品配置类型代码") - private String prodCfgTypeCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java deleted file mode 100644 index fd4cf72..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :产品配置明细 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_CFG_DETAIL") -@Api("产品配置明细") -public class MesProdCfgDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -8362302529703401583L; - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "IS_VIRTUAL") - @ApiParam("是否虚零件") - private Integer isVirtual; - - @Transient - @ApiParam("零件名称") - private String partName; - - public int getIsVirtualVal() { - return this.isVirtual == null ? 0 : this.isVirtual; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java deleted file mode 100644 index a68bcec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 3:25 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_PACK") -@Api("产品包装关系") -public class MesProdPack extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2621135811864108025L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "PACK_SPEC") - @ApiParam("包装规格") - private String packSpec; - - @Column(name = "PROD_LABEL_TEMPLATE") - @ApiParam("产品标签模板") - private String prodLabelTemplate; - - @Column(name = "PACK_LABEL_TEMPLATE") - @ApiParam("包装标签模板") - private String packLabelTemplate; - - @Column(name = "PACK_LABEL_TEMPLATE2") - @ApiParam("包装标签模板2") - private String packLabelTemplate2; - - @Column(name = "PACK_LABEL_TEMPLATE3") - @ApiParam("包装标签模板3") - private String packLabelTemplate3; - - @Column(name = "PACK_LABEL_TEMPLATE4") - @ApiParam("包装标签模板4") - private String packLabelTemplate4; - - @Column(name = "PROD_CFG_TYPE") - @ApiParam("项目") - private String prodCfgType; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java deleted file mode 100644 index 4e8c76d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :产品类流程配置表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_CFG") -@Api("产品类流程配置表") -public class MesProdRouteCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -3768632071281056796L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java deleted file mode 100644 index 169af24..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :产品流程配置操作参数表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_OPT_PARAM") -@Api("产品流程配置操作参数表") -public class MesProdRouteOptParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -932364659894292000L; - @Column(name = "PROD_ROUTE_CFG_ID") - @ApiParam("产品流程ID") - private Long prodRouteCfgId; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步顺序") - private Integer stepSeq; - - @Column(name = "PARAM_CODE") - @ApiParam("工步参数代码") - private String paramCode; - - @Column(name = "PARAM_VALUE") - @ApiParam("工步参数值") - private String paramValue; - - public long getProdRouteCfgIdVal() { - return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId; - } - - public int getStepSeq() { - return this.stepSeq == null ? 0 : this.stepSeq; - } - - public void setStepSeq(int stepSeq) { - this.stepSeq = stepSeq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java deleted file mode 100644 index 180b0df..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description :散件产品配置明细 - * @Reference : - * @Author : zcg - * @Date : 2020/3/9 0009 - 17:52 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_SCATTER_CFG_BOM") -@Api("散件产品配置明细") -public class MesProdScatterCfgBom extends BaseBean implements Serializable { - - @Column(name = "SP_CFG_CODE") - @ApiParam("散件配置编码") - private String spCfgCode; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品位置代码") - private String produceCtgyCode; - - @Column(name = "PART_NO") - @ApiParam("散件产品代码") - private String partNo; - - @Column(name = "ITEM_PART_NO") - @ApiParam("原材料物料号") - private String itemPartNo; - - @Column(name = "QTY") - @ApiParam("用量") - private BigDecimal qty; - - @Column(name = "IS_KEY_PART") - @ApiParam("是否关键件") - private Integer isKeyPart ; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java deleted file mode 100644 index 5520632..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-26-10:25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_CATEGORY") -@Api("系统业务动作") -public class MesProduceCategory extends BaseBean implements Serializable { - - private static final long serialVersionUID = 4593983703007675620L; - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PRODUCE_CTGY_NAME") - @ApiParam("产品类型名称") - private String produceCategoryName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java deleted file mode 100644 index aeda2b0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_CTGY_PICTURE") -@Api("产品类型图片表") -public class MesProduceCtgyPicture extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7223382567320219332L; - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCtgyCode; - - @Column(name = "SIDE_LOCATION") - @ApiParam("面位") - private String sideLocation; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - - @Transient - @ApiParam("文件名称") - private String fileName; - - @Transient - @ApiParam("文件URL") - private String fileUrl; - - @ApiParam("图片URL") - private String pictureUrl; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java deleted file mode 100644 index 5e3440d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ /dev/null @@ -1,205 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) - } -) -@Api("产品条码表") -public class MesProduceSn extends BaseBean implements Serializable { - - private static final long serialVersionUID = 6641051790330191326L; - - @Column(name = "SERIAL_NUMBER", nullable = false) - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "QC_STATUS") - @ApiParam("质量状态") - private Integer qcStatus; - - @Column(name = "SN_STATUS") - @ApiParam("条码状态") - private Integer snStatus; - - @Column(name = "PRINT_COUNT") - @ApiParam("打印次数") - private Integer printCount; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态") - private Integer printStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS_CODE") - @ApiParam("下一工序代码") - private String nextProcessCode; - - @Column(name = "IN_WC_TIME") - @ApiParam("进产线时间") - private String inWorkCenterTime; - - @Column(name = "OUT_WC_TIME") - @ApiParam("出产线时间") - private String outWorkCenterTime; - - @Column(name = "SHIPPING_TIME") - @ApiParam("发运时间") - private String shippingTime; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "CUST_SN") - @ApiParam("客户条码") - private String custSn; - - @Column(name = "CUST_PART_NO") - @ApiParam("客户零件号") - private String custPartNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "SN_TYPE") - @ApiParam("条码类型 10=正常 20=首检件") - private Integer snType; - - @Column(name = "TRAY_NO") - @ApiParam("托盘号") - private String trayNo; -// -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public transient Integer lockVersion; - - @Transient - @ApiParam("返回信息") - private String resultMsg; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Transient - @ApiParam("下线时间开始") - private String outWorkCenterTimeStart; - - @Transient - @ApiParam("下线时间截止") - private String outWorkCenterTimeEnd; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getQcStatusVal() { - return this.qcStatus == null ? 0 : this.qcStatus; - } - - public int getSnStatusVal() { - return this.snStatus == null ? 0 : this.snStatus; - } - - public int getPrintCountVal() { - return this.printCount == null ? 0 : this.printCount; - } - - public int getPrintStatusVal() { - return this.printStatus == null ? 0 : this.printStatus; - } - - public int getSnTypeVal() { - return this.snType == null ? 0 : this.snType; - } - - @Override - public String toString() { - return "MesProduceSn{" + - "serialNumber='" + serialNumber + '\'' + - ", partNo='" + partNo + '\'' + - ", partNameRdd='" + partNameRdd + '\'' + - ", qty=" + qty + - ", qcStatus=" + qcStatus + - ", snStatus=" + snStatus + - ", printCount=" + printCount + - ", printStatus=" + printStatus + - ", workCenterCode='" + workCenterCode + '\'' + - ", workCellCode='" + workCellCode + '\'' + - ", routeCode='" + routeCode + '\'' + - ", processCode='" + processCode + '\'' + - ", nextProcessCode='" + nextProcessCode + '\'' + - ", inWorkCenterTime='" + inWorkCenterTime + '\'' + - ", outWorkCenterTime='" + outWorkCenterTime + '\'' + - ", shippingTime='" + shippingTime + '\'' + - ", workOrderNo='" + workOrderNo + '\'' + - ", custSn='" + custSn + '\'' + - ", custPartNo='" + custPartNo + '\'' + - ", snType=" + snType + - ", trayNo='" + trayNo + '\'' + - ", resultMsg='" + resultMsg + '\'' + - ", operateType=" + operateType + - ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + - ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java deleted file mode 100644 index 5d8ce41..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ /dev/null @@ -1,154 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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 : dragon.xu - * @CreateDate : 2019-05-29 16:22 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "MODIFY_DATE_TIME") -}) -@Api("产品条码履历表") -public class MesProduceSnTravel extends BaseBean implements Serializable { - private static final long serialVersionUID = -1692487592284871549L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "QC_STATUS") - @ApiParam("质量状态") - private Integer qcStatus; - - @Column(name = "SN_STATUS") - @ApiParam("条码状态") - private Integer snStatus; - - @Column(name = "PRINT_COUNT") - @ApiParam("打印次数") - private Integer printCount; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态") - private Integer printStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS_CODE") - @ApiParam("下一工序代码") - private String nextProcessCode; - - @Column(name = "IN_WC_TIME") - @ApiParam("进产线时间") - private String inWorkCenterTime; - - @Column(name = "OUT_WC_TIME") - @ApiParam("出产线时间") - private String outWorkCenterTime; - - @Column(name = "SHIPPING_TIME") - @ApiParam("发运时间") - private String shippingTime; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "CUST_SN") - @ApiParam("客户条码") - private String custSn; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_PART_NO") - @ApiParam("客户零件号") - private String custPartNo; - - @Column(name = "SN_TYPE") - @ApiParam("条码类型 10=正常（默认），20=首检件") - private Integer snType; - - @Column(name = "TRAY_NO") - @ApiParam("托盘号") - private String trayNo; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Transient - @ApiParam("返回信息") - private String resultMsg; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getQcStatusVal() { - return this.qcStatus == null ? 0 : this.qcStatus; - } - - public int getSnStatusVal() { - return this.snStatus == null ? 0 : this.snStatus; - } - - public int getPrintCountVal() { - return this.printCount == null ? 0 : this.printCount; - } - - public int getPrintStatusVal() { - return this.printStatus == null ? 0 : this.printStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java deleted file mode 100644 index 600bfc2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ /dev/null @@ -1,109 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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 : Wynne.Lu - * @CreateDate : 2019-10-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "OBJECT_CODE"), - @Index(columnList = "MODIFY_DATE_TIME") -}) -@Api("生产数据") -public class MesProductData extends BaseBean implements Serializable { - private static final long serialVersionUID = -2365404168777050771L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CELL_NAME") - @ApiParam("工作单元名称") - private String workCellName; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_DESC") - @ApiParam("物料名称") - private String partDesc; - - @Column(name = "EQU_CODE") - @ApiParam("设备代码") - private String equCode; - - @Column(name = "EQU_NAME") - @ApiParam("设备名称") - private String equName; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "FIELD_CODE") - @ApiParam("字段代码") - private String fieldCode; - - @Column(name = "FIELD_NAME") - @ApiParam("字段名称") - private String fieldName; - - @Column(name = "FIELD_VALUE") - @ApiParam("字段值") - private String fieldValue; - - @Column(name = "ROW_NO") - @ApiParam("数据行号") - private String rowNo; - - @Column(name = "GROUP_NO") - @ApiParam("数据组号") - private String groupNo; - - @Lob - @Column(name = "LINE_DATA") - @ApiParam("生产数据") - private String lineData; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java deleted file mode 100644 index b1b3d8c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_ENCODE_CFG") -@Api("产品编码配置表") -public class MesProductEncodeCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = 6641051790330191326L; - - @Column(name = "CODE_TYPE") - @ApiParam("编码类型") - private Integer codeType; - - @Column(name = "MATCH_TYPE") - @ApiParam("匹配类型") - private Integer matchType; - - @Column(name = "MATCH_VALUE") - @ApiParam("匹配值") - private String matchValue; - - @Column(name = "RULE_CODE") - @ApiParam("编码规则代码") - private String ruleCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java deleted file mode 100644 index b5b9fa2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ /dev/null @@ -1,107 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 16:33 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA", indexes = { - @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "SN") -}) -@Api("质量过程检测数据") -public class MesQcCheckData extends BaseBean implements Serializable { - - private static final long serialVersionUID = 3600528549583720850L; - @Column(name = "CHECK_ID") - @ApiParam("检测id") - private String checkId; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "CHECK_TYPE") - @ApiParam("检测类型") - private Integer checkType; - - @Column(name = "CHECK_ITEM") - @ApiParam("检测项") - private String checkItem; - - @Column(name = "CHECK_STANDARD") - @ApiParam("检测标准") - private String checkStandard; - - @Column(name = "CHECK_GUIDE") - @ApiParam("检测指导") - private String checkGuide; - - @Column(name = "CHECK_FREQUENCY") - @ApiParam("频率") - private String checkFrequency; - - @Column(name = "CHECK_VALUE") - @ApiParam("检测值") - private String checkValue; - - @Column(name = "CHECK_RESULT") - @ApiParam("判定结果") - private String checkResult; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Integer qty; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Transient - @ApiParam("产品条码") - private String serialNumber; - - @Transient - @ApiParam("过程质量检测数据") - private List mesQcCheckStandardList; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java deleted file mode 100644 index be9bfe8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ /dev/null @@ -1,108 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 14:46 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_STANDARD") -@Api("质量检测标准") -public class MesQcCheckStandard extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1590320231495124712L; - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "CHECK_TYPE") - @ApiParam("检测类型") - private Integer checkType; - - @Column(name = "CHECK_ITEM") - @ApiParam("检测项") - private String checkItem; - - @Column(name = "CHECK_STANDARD") - @ApiParam("检测标准") - private String checkStandard; - - @Column(name = "CHECK_GUIDE") - @ApiParam("检测指导") - private String checkGuide; - - @Column(name = "CHECK_FREQUENCY") - @ApiParam("频率") - private String checkFrequency; - - @Transient - @ApiParam("物料名称") - private String partName; - - @Transient - @ApiParam("检测结果") - private String checkResult; - - @Transient - @ApiParam("检测值") - private String checkValue; - - @Column(name = "CHECK_ITEM_TYPE") - @ApiParam("检测项类型") - private String checkItemType; - - @Transient - @ApiParam("检测项类型名称") - private String checkItemTypeName; - - @Transient - private List childQcList; - - public MesQcCheckStandard() { - } - - public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard - , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { - this.id = id; - this.partNo = partNo; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.checkType = checkType; - this.checkItem = checkItem; - this.checkStandard = checkStandard; - this.checkGuide = checkGuide; - this.checkFrequency = checkFrequency; - this.partName = partName; - this.checkItemType = checkItemType; - this.checkItemTypeName = checkItemTypeName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java deleted file mode 100644 index 7d4bd81..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :JIS发运队列 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIS") -@Api("JIS发运队列") -public class MesQueueJis extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8028683333028906395L; - @Column(name = "JIS_NO") - @ApiParam("主队列编号") - private String jisNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "VIN_CODE") - @ApiParam("vin") - private String vinCode; - - @Column(name = "CAR_NO") - @ApiParam("车号") - private String carNo; - - @Column(name = "SEQ") - @ApiParam("排序") - private Double seq; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Transient - @ApiParam("颜色") - private String color; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java deleted file mode 100644 index ef3b7d1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :JIS发运队列明细 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIS_DETAIL") -@Api("JIS发运队列明细") -public class MesQueueJisDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 829273008952400763L; - @Column(name = "JIS_NO") - @ApiParam("主队列编号") - private String jisNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "FINAL_STATUS") - @ApiParam("明细整体状态") - private Integer finalStatus; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java deleted file mode 100644 index c8dcab7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER", indexes = { - @Index(columnList = "CUST_FLAG_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) - } -) -@Api("生产队列主表") -public class MesQueueOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 6538031118299400711L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("主队列编号") - private String orderNo; - - @Column(name = "VIN_CODE") - @ApiParam("Vin") - private String vinCode; - - @Column(name = "CUST_FLAG_NO") - @ApiParam("客户标识号") - private String custFlagNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PROD_CFG_NAME_RDD") - @ApiParam("产品配置名称") - private String prodCfgNameRdd; - - @Column(name = "SEQ") - @ApiParam("排序") - private Double seq; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Transient - @ApiParam("起始车号") - private String custFlagNoStart; - - @Transient - @ApiParam("截至车号") - private String custFlagNoEnd; - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java deleted file mode 100644 index a266608..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ /dev/null @@ -1,103 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { - @Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) - } -) -@Api("生产队列明细") -public class MesQueueOrderDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 1548933241804083457L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("主队列编号") - private String orderNo; - - @Column(name = "PART_NO", nullable = false) - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "SEQ") - @ApiParam("队列明细序号") - private Double seq; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "WORK_TYPE") - @ApiParam("生产类型") - private String workType; - - @Column(name = "PRODUCE_CATEGORY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PRODUCE_CATEGORY_NAME_RDD") - @ApiParam("产品类型名称") - private String produceCategoryNameRdd; - - @Transient - @ApiParam("队列序号") - private Double queueSeq; - - public double getQueueSeqVal() { - return this.queueSeq == null ? 0.0d : this.queueSeq; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public MesQueueOrderDetail() { - } - - public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) { - this.queueSeq = queueSeq; - this.seq = seq; - this.serialNumber = serialNumber; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java deleted file mode 100644 index 3f3458c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) -@Api("原材料信息") -public class MesRawPartSn extends BaseBean implements Serializable { - private static final long serialVersionUID = 5504323561257182116L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("数量") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("生产批次") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批次") - private String fixLotNo; - - @Column(name = "STATUS") - @ApiParam("原料状态") - private Integer status; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java deleted file mode 100644 index 785f350..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :维修 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-08 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR") -@Api("维修") -public class MesRepair extends BaseBean implements Serializable { - private static final long serialVersionUID = -7520365696308295804L; - @Column(name = "REPAIR_CODE") - @ApiParam("维修代码") - private String repairCode; - - @Column(name = "REPAIR_NAME") - @ApiParam("维修名称") - private String repairName; - - @Column(name = "REPAIR_TYPE") - @ApiParam("维修类型") - private Integer repairType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java deleted file mode 100644 index e6da731..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ /dev/null @@ -1,102 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:33 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("维修信息记录表") -public class MesRepairRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2453726410779076150L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "SIDE_LOCATION") - @ApiParam("产品面位") - private String sideLocation; - - @Column(name = "DEFECT_LOCATION") - @ApiParam("缺陷位置") - private String defectLocation; - - @Column(name = "REPAIR_CODE") - @ApiParam("维修代码") - private String repairCode; - - @Column(name = "REPAIR_NAME") - @ApiParam("维修名称") - private String repairName; - - @Column(name = "DC_CODE") - @ApiParam("缺陷原因代码") - private String dcCode; - - @Column(name = "DC_NAME") - @ApiParam("缺陷原因描述") - private String dcName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Transient - @ApiParam("备注") - private String spareMemo; - - @Transient - @ApiParam("不良记录id") - private Long defectRecordId; - - @Transient - @ApiParam("缺陷集合") - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java deleted file mode 100644 index f8b2802..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :流程表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE") -@Api("流程表") -public class MesRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = -7622507229961050740L; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "ROUTE_NAME") - @ApiParam("流程名称") - private String routeName; - - @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") - private Integer routeType; - - @Lob - @Column(name = "POSITION") - @ApiParam("GOJS位置") - private String position; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java deleted file mode 100644 index 556d26f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :流程工序关系 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE_PROCESS") -@Api("流程工序关系") -public class MesRouteProcess extends BaseBean implements Serializable { - private static final long serialVersionUID = 3477334942090180010L; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS") - @ApiParam("下一工序") - private String nextProcess; - - @Column(name = "REPAIR_PROCESS") - @ApiParam("维修工序") - private String repairProcess; - - @Column(name = "SEQ") - @ApiParam("顺序") - private Integer seq; - - @Column(name = "IS_NECESSARY") - @ApiParam("是否必须") - private Integer isNecessary; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - - public int getIsNecessaryVal() { - return this.isNecessary == null ? 0 : this.isNecessary; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java deleted file mode 100644 index 5907cec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工序工作单元 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE_PROCESS_CELL") -@Api("工序工作单元对照") -public class MesRouteProcessCell extends BaseBean implements Serializable { - private static final long serialVersionUID = -703779336699805482L; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java deleted file mode 100644 index a77b075..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :报废原因 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-08 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP") -@Api("报废原因") -public class MesScrap extends BaseBean implements Serializable { - private static final long serialVersionUID = -6202113707752178624L; - @Column(name = "SCRAP_CODE") - @ApiParam("报废代码") - private String scrapCode; - - @Column(name = "SCRAP_NAME") - @ApiParam("报废名称") - private String scrapName; - - @Column(name = "SCRAP_TYPE") - @ApiParam("报废类型") - private String scrapType; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java deleted file mode 100644 index 97ac5d3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:42 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("报废信息记录表") -public class MesScrapRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -8519832449647086195L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "SCRAP_CODE") - @ApiParam("报废代码") - private String scrapCode; - - @Column(name = "SCRAP_NAME") - @ApiParam("报废名称") - private String scrapName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java deleted file mode 100644 index 13874ae..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : crish - * @CreateDate : 2019-04-19 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT") -@Api("班次信息") -public class MesShift extends BaseBean implements Serializable { - private static final long serialVersionUID = -1174268061355263705L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次代码") - private String shiftCode; - - @Column(name = "SHIFT_NAME") - @ApiParam("班次名称") - private String shiftName; - - @Column(name = "START_TIME") - @ApiParam("开班时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("下班时间") - private String endTime; - - @Column(name = "WORK_TIMES") - @ApiParam("作业时长") - private Double workTimes; - - @Column(name="SHIFT_SEQ") - @ApiParam("班次顺序") - private Integer shiftSeq; - - public int getShiftSeqVal() { - return this.shiftSeq == null ? 0 : this.shiftSeq; - } - - public double getWorkTimesVal() { - return this.workTimes == null ? 0.0d : this.workTimes; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java deleted file mode 100644 index 7aac2d7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-18-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT_GROUP") -@Api("班组") -public class MesShiftGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = 8962836866086379111L; - @Column(name = "GROUP_CODE") - @ApiParam("班组代码") - private String groupCode; - - @Column(name = "GROUP_NAME") - @ApiParam("班组名称") - private String groupName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SQUAD_LEADER") - @ApiParam("班长") - private String squadLeader; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java deleted file mode 100644 index a7c1232..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : yiming.gu - * @CreateDate : 2019-05-20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT_REST") -@Api("班次休息信息") -public class MesShiftRest extends BaseBean implements Serializable { - private static final long serialVersionUID = -8712815093203320523L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次代码") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "REST_TIMES") - @ApiParam("休息时长") - private Double restTimes; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java deleted file mode 100644 index b29fae0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/18 0018 - 9:07 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SN_PHOTO_RELATION") -@Api("条码照片关系") -public class MesSnPhotoRelation extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7732648131003455681L; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("条码") - private String serialNumber; - - @Column(name = "PHOTO_PATH") - @ApiParam("照片路径") - private String photoPath; - - @Column(name = "PHOTO_NAME") - @ApiParam("照片名称") - private String photoName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java deleted file mode 100644 index b376b32..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java +++ /dev/null @@ -1,151 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; -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.Transient; -import java.io.Serializable; - -/** - * @Description :工序物料清单 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STATION_BOM") -@Api("工序物料清单") -public class MesStationBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -4693067673094931011L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("产品物料名称") - private String partName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子零件") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("原材料物料名称") - private String itemPartName; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "子零件数量", example = "0") - private Double qty; - - @Column(name = "IS_REPEAT") - @ApiParam(value = "是否可重复") - private Integer isRepeat; - - @Column(name = "IS_CHECK") - @ApiParam(value = "是否检查") - private Integer isCheck; - - @Column(name = "IS_FEED") - @ApiParam(value = "是否投料配置") - private Integer isFeed; - - @Column(name = "IS_BIND_KEY") - @ApiParam(value = "是否绑定关键件") - private Integer isBindKey; - - @Transient - @ApiParam(value = "绑定数量") - private Double boundQty; - - @Transient - @ApiParam("是否已绑定") - private Boolean isBind; - - @Transient - @ApiParam("显示颜色") - private String color; - - @Transient - @ApiParam("关键件代码") - private String keyBarCode; - - @Transient - @ApiParam("产品条码") - private String serialNumber; - - public double getBoundQtyVal() { - return this.boundQty == null ? 0.0d : this.boundQty; - } - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getIsRepeatVal() { - return this.isRepeat == null ? 0 : this.isRepeat; - } - - public int getIsCheckVal() { - return this.isCheck == null ? 0 : this.isCheck; - } - - public boolean getIsBindVal() { - return this.isBind == null ? false : this.isBind; - } - - public int getIsFeedVal() { - return this.isFeed == null ? 0 : this.isFeed; - } - - @Override - public String toString() { - return "MesStationBom{" + - "partNo='" + partNo + '\'' + - ", itemPartNo='" + itemPartNo + '\'' + - ", qty=" + qty + - ", isRepeat=" + isRepeat + - ", isCheck=" + isCheck + - ", isFeed=" + isFeed + - ", isBind=" + isBind + - ", color='" + color + '\'' + - ", id=" + id + - ", organizeCode='" + organizeCode + '\'' + - ", isValid=" + isValid + - ", isDeleted=" + isDeleted + - ", createUser='" + createUser + '\'' + - ", createDatetime='" + createDatetime + '\'' + - ", modifyUser='" + modifyUser + '\'' + - ", modifyDatetime='" + modifyDatetime + '\'' + - ", createDateTimeStart='" + createDateTimeStart + '\'' + - ", createDateTimeEnd='" + createDateTimeEnd + '\'' + - ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' + - ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' + - ", orderByParam='" + orderByParam + '\'' + - ", ascOrDesc=" + ascOrDesc + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java deleted file mode 100644 index 0998015..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java +++ /dev/null @@ -1,102 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :工步 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STEP") -@Api("工步") -public class MesStep extends BaseBean implements Serializable { - private static final long serialVersionUID = -2157306767211269786L; - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_NAME") - @ApiParam("工步名称") - private String stepName; - - @Column(name = "STEP_TEXT") - @ApiParam("工步描述") - private String stepText; - - @Column(name = "STEP_TYPE") - @ApiParam("工步类型") - private String stepType; - - @Column(name = "STEP_OBJECT") - @ApiParam("工步对象") - private String stepObject; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("流程代码") - private String routeCode; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工序代码") - private String processCode; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工步顺序") - private Integer stepSeq; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工步执行完毕") - private boolean isComplete; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工步是否跳过") - private boolean isJump; - - public MesStep() { - } - - public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq) { - this.stepCode = stepCode; - this.stepName = stepName; - this.stepText = stepText; - this.stepType = stepType; - this.stepObject = stepObject; - this.routeCode = routeCode; - this.processCode = processCode; - this.stepSeq = stepSeq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java deleted file mode 100644 index dd5a834..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工步参数 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STEP_PARAM") -@Api("工步参数") -public class MesStepParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -147541368320233093L; - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_ATTRIBUTE") - @ApiParam("参数属性") - private String paramAttribute; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java deleted file mode 100644 index 0d30d54..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TIME") -@Api("工步参数") -public class MesTime extends BaseBean implements Serializable { - private static final long serialVersionUID = 1562011791394529076L; - - @Column(name = "MODULE") - @ApiParam("组件") - private String module; - - @Column(name = "ELAPSE") - @ApiParam("耗时") - private Long elapse; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java deleted file mode 100644 index b6071b9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :扭矩信息记录表 - * @Reference : - * @Author : Crish - * @CreateDate : 2019-05-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TORQUE_DETAIL") -@Api("扭矩信息记录表") -public class MesTorqueDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 2900363253333046861L; - - @Column(name = "SN") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "UPPER_LIMIT") - @ApiParam("最大值") - private Double upperLimit; - - @Column(name = "LOWER_LIMIT") - @ApiParam("最小值") - private Double lowerLimit; - - @Column(name = "TORQUE_DETAIL_VALUE") - @ApiParam("扭矩值") - private Double torqueValue; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "ok") - @ApiParam("扭矩是否合格") - private String ok; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "p_set") - @ApiParam("螺丝枪PSET设置值") - private String deviceSetValue; - - @Column(name = "MAXANGLE") - @ApiParam("最大扭矩") - private String maxAngle; - - @Column(name = "MINANGLE") - @ApiParam("最小扭矩") - private String minAngel; - - @Column(name = "FINALANGLE") - @ApiParam("最终扭矩") - private Integer finalAngle; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单号") - private String workOrderNo; - - @Column(name = "KEY_DATA_CODE") - @ApiParam("关键数据代码") - private String keyDataCode; - - @Column(name = "RESULT_MSG") - @ApiParam("扭矩判定结果") - private String resultMsg; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java deleted file mode 100644 index 506ed2a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\22 16:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TYPE_CFG") -@Api("类型信息表") -public class MesTypeCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -1699612238800419597L; - - @Column(name = "TYPE_CODE") - @ApiParam("类型代码") - private String typeCode; - - @Column(name = "TYPE_NAME") - @ApiParam("类型名称") - private String typeName; - - @Column(name = "BUSINESS_TYPE_CODE") - @ApiParam("业务类型代码") - private String businessTypeCode; - - @Column(name = "BUSINESS_TYPE_NAME") - @ApiParam("业务类型名称") - private String businessTypeName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java deleted file mode 100644 index a089f0a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 1:45 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK") -@Api("开线检查") -public class MesWcCheck extends BaseBean implements Serializable { - private static final long serialVersionUID = 8057329890155185557L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "CHECK_TYPE") - @ApiParam("检查类型") - private String checkType; - - @Column(name = "CHECK_OBJ") - @ApiParam("检查对象") - private String checkObj; - - @Column(name = "CHECK_ITEM") - @ApiParam("检查项") - private String checkItem; - - @Column(name = "STANDARD") - @ApiParam("检查标准") - private String standard; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java deleted file mode 100644 index fbf5699..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ /dev/null @@ -1,83 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 1:57 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("开线检查记录") -public class MesWcCheckRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2173902677953303765L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_ORDER") - @ApiParam("工单号") - private String workOrder; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "CHECK_TYPE") - @ApiParam("检查类型") - private String checkType; - - @Column(name = "CHECK_OBJ") - @ApiParam("检查对象") - private String checkObj; - - @Column(name = "CHECK_ITEM") - @ApiParam("检查项") - private String checkItem; - - @Column(name = "STANDARD") - @ApiParam("检查标准") - private String standard; - - @Column(name = "CHECK_RESULT") - @ApiParam("检查结果") - private String checkResult; - - @Column(name = "CHECK_VALUE") - @ApiParam("检查值") - private String checkValue; - - @Column(name = "REASON") - @ApiParam("原因") - private String reason; - - @Column(name = "GROUP_CODE") - @ApiParam("组名") - private String groupCode; - - @Column(name = "OVERALL_RESULT") - @ApiParam("总体结果") - private Integer overAllResult; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java deleted file mode 100644 index feeef17..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 2:31 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_EQUIPMENT") -@Api("工作单元设备关系表") -public class MesWcEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 2088600237918553286L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java deleted file mode 100644 index e9bd56b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工作单元 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL") -@Api("工作单元") -public class MesWorkCell extends BaseBean implements Serializable { - private static final long serialVersionUID = -493313481197504121L; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "WORK_CELL_NAME") - @ApiParam("工作单元名称") - private String workCellName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("生产区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_TYPE") - @ApiParam("工位类型") - private Integer workCellType; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - @Column(name = "WORK_CELL_IP") - @ApiParam("工作单元IP") - private String workCellIp; - - @Column(name = "WORK_CELL_PORT") - @ApiParam("工作单元端口") - private String workCellPort; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java deleted file mode 100644 index 2200ceb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/16 2:42 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("工位监控异常信息") -public class MesWorkCellMonitorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -5634446206963213556L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单") - private String workOrderNo; - - @Column(name = "STEP_CODE") - @ApiParam("工步") - private String stepCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序") - private String processCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程") - private String routeCOde; - - @Lob - @Column(name = "MESSAGE") - @ApiParam("异常信息") - private String message; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java deleted file mode 100644 index 2249726..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工作单元参数 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-30 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_PARAM") -@Api("mes工作单元参数") -public class MesWorkCellParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -3659425774085368499L; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_TYPE") - @ApiParam("参数类型") - private Integer paramType; - - @Column(name = "PARAM_MODEL") - @ApiParam("参数模式") - private Integer paramModel; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java deleted file mode 100644 index a434107..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工作单元参数配置 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_PARAM_CFG") -@Api("工作单元参数配置") -public class MesWorkCellParamCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 1739991089354361293L; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_VALUE") - @ApiParam("参数值") - private String paramValue; - - @Column(name = "IS_CHECK") - @ApiParam("是否必须校验") - private Integer isCheck; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java deleted file mode 100644 index 0329add..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : 工站队列 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-22 17:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_POINT") -@Api("工站队列") -public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = 2881841596678871526L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "QUEUE_SEQ") - @ApiParam("队列主表序号") - private Double queueSeq; - - @Column(name = "QUEUE_DETAIL_SEQ") - @ApiParam("队列明细表序号") - private Double queueDetailSeq; - - public double getQueueSeqVal() { - return this.queueSeq == null ? 0 : this.queueSeq; - } - - public double getQueueDetailSeqVal() { - return this.queueDetailSeq == null ? 0 : this.queueDetailSeq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java deleted file mode 100644 index 5932327..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :配置表 - * @Reference : - * @Author : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_STATUS") -@Api("工位运行状态") -public class MesWorkCellStatus extends BaseBean implements Serializable { - private static final long serialVersionUID = 102975351699481524L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "TIME_OUT_STATUS") - @ApiParam("超时状态") - private Integer timeOutStatus; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java deleted file mode 100644 index 3d35275..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工作中心 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CENTER") -@Api("工作中心") -public class MesWorkCenter extends BaseBean implements Serializable { - private static final long serialVersionUID = -1119897685621371682L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "ERP_WORK_CENTER") - @ApiParam("ERP工作中心") - private String erpWorkCenter; - - @Column(name = "WORK_VER") - @ApiParam("工作版本") - private String workVer; - - @Column(name = "AREA_CODE") - @ApiParam("生产区域代码") - private String areaCode; - - @Column(name = "RUNNING_STATUS") - @ApiParam("运行状态") - private String runningStatus; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java deleted file mode 100644 index c4443eb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ /dev/null @@ -1,249 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.pcn.model.MesButtonFlagModel; -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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) -}) -@Api("生产工单") -public class MesWorkOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 8065877030194822855L; - - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("工单号") - private String orderNo; - - @Column(name = "PART_NO", nullable = false) - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "COMPLETE_QTY") - @ApiParam("完成数量") - private Double completeQty; - - @Column(name = "REPAIR_QTY") - @ApiParam("返修数量") - private Double repairQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数量") - private Double scrapQty; - - @Column(name = "SEQ") - @ApiParam("工单序号") - private Double seq; - - @Column(name = "WO_STATUS") - @ApiParam("工单状态") - private Integer workOrderStatus; - - @Column(name = "WO_TYPE") - @ApiParam("工单类型") - private Integer workOrderType; - - @Column(name = "NEXT_ORDER") - @ApiParam("下一工单") - private String nextOrder; - - @Column(name = "PLAN_ORDER_NO") - @ApiParam("生产计划单号") - private String planOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "SCHEDULE_DATE") - @ApiParam("排产日期") - private String scheduleDate; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("结束时间") - private String endTime; - - @Column(name = "WO_SOURCE") - @ApiParam("工单来源") - private String workOrderSource; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "SHIFT_GROUP") - @ApiParam("班组") - private String shiftGroup; - - @Column(name = "APPROVAL_STATUS") - @ApiParam("审批状态") - private Integer approvalStatus; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; - - @Column(name = "FI_COMPLETE_QTY") - @ApiParam("首检完成数量") - private Double fiCompleteQty; - - @Column(name = "FI_GENERATE_QTY") - @ApiParam("首检生成数量") - private Double fiGenerateQty; - - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; - - /********************** 冗余字段 *********************************/ - @Transient - @ApiParam(value = "工作中心名称") - public String workCenterName; - - @Transient - @ApiParam(value = "工作单元名称") - public String workCellName; - - @Transient - @ApiParam(value = "客户产线名称") - public String custProdLineName; - - @Transient - @ApiParam(value = "班次名称") - public String shiftName; - - @Transient - @ApiParam(value = "班组名称") - public String shiftGroupName; - - @Transient - @ApiParam(value = "产品配置名称") - public String prodCfgName; - - @Transient - @ApiParam("区域代码名称") - private String areaCodeName; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - @Transient - @ApiParam("mes生产工单页面按钮控制") - private MesButtonFlagModel mesButtonFlagModel; - - @Transient - @ApiParam("批量打包开窗页面查询工单=1") - private String pageType; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getCompleteQtyVal() { - return this.completeQty == null ? 0.0d : this.completeQty; - } - - public double getRepairQtyVal() { - return this.repairQty == null ? 0.0d : this.repairQty; - } - - public double getScrapQtyVal() { - return this.scrapQty == null ? 0.0d : this.scrapQty; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public int getWorkOrderStatusVal() { - return this.workOrderStatus == null ? 0 : this.workOrderStatus; - } - - public int getWorkOrderTypeVal() { - return this.workOrderType == null ? 0 : this.workOrderType; - } - - public int getApprovalStatusVal() { - return this.approvalStatus == null ? 0 : this.approvalStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java deleted file mode 100644 index caba23a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ /dev/null @@ -1,231 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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: wangjie - * @CreateDate:2019-09-19-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG", indexes = { - @Index(columnList = "ORDER_NO"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("生产工单日志") -public class MesWorkOrderLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -7018645997937147427L; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "COMPLETE_QTY") - @ApiParam("完成数量") - private Double completeQty; - - @Column(name = "REPAIR_QTY") - @ApiParam("返修数量") - private Double repairQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数量") - private Double scrapQty; - - @Column(name = "SEQ") - @ApiParam("工单序号") - private Double seq; - - @Column(name = "WO_STATUS") - @ApiParam("工单状态") - private Integer workOrderStatus; - - @Column(name = "WO_TYPE") - @ApiParam("工单类型") - private Integer workOrderType; - - @Column(name = "NEXT_ORDER") - @ApiParam("下一工单") - private String nextOrder; - - @Column(name = "PLAN_ORDER_NO") - @ApiParam("生产计划单号") - private String planOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "SCHEDULE_DATE") - @ApiParam("排产日期") - private String scheduleDate; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("结束时间") - private String endTime; - - @Column(name = "WO_SOURCE") - @ApiParam("工单来源") - private String workOrderSource; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "SHIFT_GROUP") - @ApiParam("班组") - private String shiftGroup; - - @Column(name = "APPROVAL_STATUS") - @ApiParam("审批状态") - private Integer approvalStatus; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; - - @Column(name = "FI_COMPLETE_QTY") - @ApiParam("首检完成数量") - private Double fiCompleteQty; - - @Column(name = "FI_GENERATE_QTY") - @ApiParam("首检生成数量") - private Double fiGenerateQty; - - /********************** 冗余字段 *********************************/ - @Transient - @ApiParam(value = "工作中心名称") - public String workCenterName; - - @Transient - @ApiParam(value = "工作单元名称") - public String workCellName; - - @Transient - @ApiParam(value = "客户产线名称") - public String custProdLineName; - - @Transient - @ApiParam(value = "班次名称") - public String shiftName; - - @Transient - @ApiParam(value = "班组名称") - public String shiftGroupName; - - @Transient - @ApiParam(value = "产品配置名称") - public String prodCfgName; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getCompleteQtyVal() { - return this.completeQty == null ? 0.0d : this.completeQty; - } - - public double getRepairQtyVal() { - return this.repairQty == null ? 0.0d : this.repairQty; - } - - public double getScrapQtyVal() { - return this.scrapQty == null ? 0.0d : this.scrapQty; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public int getWorkOrderStatusVal() { - return this.workOrderStatus == null ? 0 : this.workOrderStatus; - } - - public int getWorkOrderTypeVal() { - return this.workOrderType == null ? 0 : this.workOrderType; - } - - public int getApprovalStatusVal() { - return this.approvalStatus == null ? 0 : this.approvalStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java deleted file mode 100644 index 3306bbf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Description : 动作请求参数 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -public class ActionRequestBean implements Serializable { - - @ApiParam("事件代码") - @Deprecated - public String eventCode; - - @ApiParam("按钮代码") - public String buttonCode; - - @ApiParam("单个结果") - public Obj resultObject; - - @ApiParam("List请求集") - public List resultList; - - @ApiParam("Map请求集") - public Map resultMap; - - @ApiParam("目的状态") - private Integer destStatus; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java deleted file mode 100644 index bfdcf1f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class AttrBean implements Serializable { - - @ApiParam("属性名称") - private String attrName; - - @ApiParam("属性名称别名") - private String attrNameAlias; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java deleted file mode 100644 index 5919ee5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class ButtonBean implements Serializable { - @ApiParam(value = "按钮代码") - private String buttonCode; - - @ApiParam(value = "按钮名称") - private String buttonName; - - // 执行类方法,sql,或者标记 - @ApiParam(value = "执行内容") - private String methodContent; - - @ApiParam(value = "按钮描述") - private String buttonDesc; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java deleted file mode 100644 index f70aaaa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/10 0010 - 15:28 - */ -@Data -@Api("数据采集Model") -public class DataAcquisitionModel { - - @ApiParam("对象代码") - private String objectCode; - - @ApiParam("对象名称") - private String objectName; - - @ApiParam("字段代码") - private String fieldCode; - - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("字段值") - private String fieldValue; -// -// @ApiParam("组号") -// private String groupNo; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java deleted file mode 100644 index 83a9451..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\28 19:50 - * @Modify: - **/ -@Data -public class DefectModel { - - private Long id; - - @ApiParam("缺陷代码") - private String defectCode; - - @ApiParam("缺陷名称") - private String defectName; - - @ApiParam("缺陷类型") - private String defectType; - - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @ApiParam("缺陷位置") - private String defectLocation; - - @ApiParam("缺陷类型子集") - private List mesDefectList; - public DefectModel() { - - } - - public DefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) { - this.id = id; - this.defectCode = defectCode; - this.defectName = defectName; - this.defectType = defectType; - this.defectTypeName = defectTypeName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java deleted file mode 100644 index ac086ba..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/12/4 3:09 下午 - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("FastDfs文件model") -public class EsopFileModel { - - private MesEsop esop; - - private MesFile file; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java deleted file mode 100644 index 418ab92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/19 7:00 PM - * @Description: - **/ - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("FastDfs文件model") -public class FastDfsDownloadModel { - - @ApiParam("部分相对路径") - private String dirPath; - - @ApiParam("文件名称") - private String fileName; - - @ApiParam("文件字节") - private byte[] fileByte; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java deleted file mode 100644 index fd91386..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 11:42 AM - * @Description: - **/ - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("生成条码模型") -public class GenSerialNoModel { - - @ApiParam("规则代码") - private String ruleCode; - - @ApiParam("规则描述") - private String ruleDesc; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("客户物料号") - private String custPartNo; - - @ApiParam("客户代码") - private String custCode; - - @ApiParam("过程条码") - private String serialNumber; - - @ApiParam("产地") - private String prodLocation; - - @ApiParam("前缀") - private String prefix; - - @ApiParam("编码规则") - private String numberRule; - - @ApiParam("序号长度") - private Integer serialnoLength; - - @ApiParam("增量") - private Integer serialnoIncrement; - - @ApiParam("最大值后循环") - private Integer isCycle; - - @ApiParam("当前编号前缀") - private String currentNumberPrefix; - - @ApiParam("当前序号") - private Integer currentSerialno; - - @ApiParam("当前编号") - private String currentNumber; - - - public GenSerialNoModel(String ruleCode) { - this.ruleCode = ruleCode; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java deleted file mode 100644 index 7883204..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Author: wangjie - * @CreateDate: 2019/8/21 9:19 AM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("mes页面按钮控制model") -public class MesButtonFlagModel implements Serializable { - - @ApiParam("修改按钮") - private boolean updateButton; - - @ApiParam("按配置修改按钮") - private boolean updateButtonConfig; - - @ApiParam("下达按钮") - private boolean transmitButton; - -// @ApiParam("测试动态下达按钮") -// private boolean dynamicTransmitButtonTest; - - @ApiParam("启动按钮") - private boolean startUpButton; - - @ApiParam("暂停按钮") - private boolean suspendButton; - - @ApiParam("取消按钮") - private boolean revokeButton; - - @ApiParam("关闭按钮") - private boolean closeButton; - - @ApiParam("完成按钮") - private boolean completeButton; - - @ApiParam("关闭按钮-提醒") - private boolean closeButtonNoticeFlag; - - @ApiParam("维修任务按钮") - private boolean repairButton; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java deleted file mode 100644 index 57ba538..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Transient; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:04 - * @Modify: - **/ -@Data -public class MesDefectModel { - - private String defectCode; - - @ApiParam("缺陷名称") - private String defectName; - - @ApiParam("缺陷类型") - private String defectType; - - @Transient - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @Transient - @ApiParam("缺陷分类子集") - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java deleted file mode 100644 index 1487bb8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ /dev/null @@ -1,125 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:05 - * @Modify: - **/ -@Data -public class MesProdBindRecordModel { - private Long id; - private String itemPartNo; - private String itemPartName; - private Double qty; - private Integer isValid; - private Integer isDeleted; - private String organizeCode; - private Integer isFeed; - private String workCenterCode; - private String workCellCode; - private String kpSn; - @ApiParam("拆解数") - private Double dismantleQty; - - @ApiParam("产品物料编码") - private String parentPartNo; - @ApiParam("产品物料名称") - private String parentPartName; - @ApiParam("合格数") - private Integer okQty; - @ApiParam("缺失数") - private Integer missQty; - @ApiParam("报废数") - private Integer scrapQty; - @ApiParam("创建时间") - private String createUser; - @ApiParam("创建时间") - private String createDatetime; - @ApiParam("修改人") - private String modifyUser; - @ApiParam("修改时间") - private String modifyDatetime; - @ApiParam("产品条码") - private String serialNumber; - @ApiParam("关联批次") - private String lotNo; - public MesProdBindRecordModel() { - - } - - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - this.dismantleQty = dismantleQty; - this.lotNo = lotNo; - } - - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String lotNo) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - this.lotNo = lotNo; - } - - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyUser = modifyUser; - this.modifyDatetime = modifyDatetime; - this.serialNumber = serialNumber; - this.lotNo = lotNo; - } - - public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) { - this.itemPartNo = itemPartNo; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.serialNumber = serialNumber; - this.lotNo = lotNo; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java deleted file mode 100644 index e6504ec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java +++ /dev/null @@ -1,75 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:04 - * @Modify: - **/ -@Data -public class MesStationBomModel { - - private Long id; - @ApiParam("子物料编码") - private String itemPartNo; - @ApiParam("子物料名称") - private String itemPartName; - @ApiParam("产品数量") - private Double qty; - private Integer isValid; - private Integer isDeleted; - private String organizeCode; - private Integer isFeed; - private String workCenterCode; - private String workCellCode; - @ApiParam("拆解数") - private Double dismantleQty; - - @ApiParam("产品物料编码") - private String parentPartNo; - @ApiParam("产品物料名称") - private String parentPartName; - @ApiParam("合格数") - private Integer okQty; - @ApiParam("缺失数") - private Integer missQty; - @ApiParam("报废数") - private Integer scrapQty; - - public MesStationBomModel() { - - } - - public MesStationBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - } - - public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java deleted file mode 100644 index f3b4227..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Map; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/25 7:41 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("PLC交互model") -public class PLCInteracticeModel { - - private String serverIp; - - private String serverPort; - - private String mwContext; - - private String protocol; - - private String plcCode; - - private String dataType; - - private String userName; - - private String password; - - private Integer enabled; - - private String realm; - - private String tag; - - private String value; - - private String comment; - - private String authenKey; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java deleted file mode 100644 index ed2bc6c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author Wynne.Lu - * @date 2020/2/21 17:20 - * @desc - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("工位监控观察者对象") -public class PcsObserverStatusModel { - - @ApiParam("产线") - private String workCenterCode; - - @ApiParam("运行状况") - private Boolean runningStatus; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java deleted file mode 100644 index ba753cc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @Author: wangjie - * @CreateDate: 2019/9/23 8:06 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("产品包装model") -public class ProdPackageModel { - - @ApiParam("工单号") - private String workOrderNo; - - @ApiParam("生产线") - private String workCenterCode; - - @ApiParam("客户代码") - private String custCode; - - @ApiParam("班次") - private String shiftCode; - - @ApiParam("班次名称") - private String shiftName; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("单位") - private String unit; - - @ApiParam("工单数量") - private Double workOrderQty; - - @ApiParam("完成数量") - private Double completeQty; - - @ApiParam("包装规格数量") - private Double packSpecQty; - - @ApiParam("包装规格") - private String packSpec; - - @ApiParam("数量") - private Double qty; - - @ApiParam("特殊批次") - private String fixLotNo; - - @ApiParam("包装集合") - private List packageList; - - @ApiParam("打印状态文字") - private String printStrStatus; - - @ApiParam("包装层级名称") - private String packLevelName; - - @ApiParam("是否封箱名称") - private String isSealedName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java deleted file mode 100644 index 727e482..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("产品包装model") -public class ProductDataModel { - - @ApiParam("字段代码") - private String fieldCode; - - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("字段值") - private String fieldValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java deleted file mode 100644 index f2ec4a3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2020\1\13 17:23 - * @Modify: - **/ -@Data -public class QcCheckStandardModel { - - private Long id; - - @ApiParam("列头") - private String title; - - private List resultList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java deleted file mode 100644 index bdb5567..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class QueueJisModel implements Serializable { - - @ApiParam("主队列编号") - private String jisNo; - - @ApiParam("vin") - private String vinCode; - - @ApiParam("车号") - private String carNo; - - @ApiParam("排序") - private Double seq; - - @ApiParam("状态") - private Integer status; - - @ApiParam("产品配置代码") - private String prodCfgCode; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @ApiParam("明细状态") - private Integer detailStatus; - - @ApiParam("产品条码") - private String serialNumber; - - @ApiParam("明细整体状态") - private Integer finalStatus; - - @ApiParam("状态名称") - private String statusName; - - @ApiParam("明细状态名称") - private String detailStatusName; - - @ApiParam("明细整体状态名称") - private String finalStatusName; - - @ApiParam("颜色") - private String color; - - public String getStatusName() { - return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); - } - - public String getDetailStatusName() { - return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); - } - - public String getFinalStatusName() { - return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); - } - - public QueueJisModel() { - } - - public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { - this.jisNo = jisNo; - this.vinCode = vinCode; - this.carNo = carNo; - this.seq = seq; - this.status = status; - this.prodCfgCode = prodCfgCode; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.produceCategoryCode = produceCategoryCode; - this.detailStatus = detailStatus; - this.serialNumber = serialNumber; - this.finalStatus = finalStatus; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java deleted file mode 100644 index e641bcf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description : JIT队列列表Model - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-22 16:34 - * @Modify: - **/ -@Data -@Api("JIT队列列表Model") -public class QueueOrderModel implements Serializable { - private Long id; - @ApiParam("队列序号") - public Double queueSeq; - @ApiParam("队列明细序号") - public Double queDetailSeq; - @ApiParam("客户标识号") - public String custFlagNo; - @ApiParam("产品配置名称") - public String prodCfgNameRdd; - @ApiParam("产品类型名称") - public String categoryNameRdd; - @ApiParam("产品条码") - public String serialNumber; - @ApiParam("物料号") - public String partNo; - @ApiParam("物料名称") - public String partNameRdd; - @ApiParam("条码状态") - public Integer snStatus; - @ApiParam("生产类型") - public String workType; - @Transient - @ApiParam("显示颜色") - private String color; - @ApiParam("工厂代码") - private String organizeCode; - @ApiParam("展示行数") - private Integer prodNum; - @ApiParam("产线") - private String workCenterCode; - @ApiParam("工位") - private String workCellCode; - - public QueueOrderModel() { - } - - public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { - this.id = id; - this.queueSeq = queueSeq; - this.queDetailSeq = queDetailSeq; - this.custFlagNo = custFlagNo; - this.prodCfgNameRdd = prodCfgNameRdd; - this.categoryNameRdd = categoryNameRdd; - this.serialNumber = serialNumber; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.snStatus = snStatus; - this.workType = workType; - } - public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType) { - this.id = id; - this.queueSeq = queueSeq; - this.queDetailSeq = queDetailSeq; - this.custFlagNo = custFlagNo; - this.prodCfgNameRdd = prodCfgNameRdd; - this.categoryNameRdd = categoryNameRdd; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.workType = workType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java deleted file mode 100644 index 231b12c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java +++ /dev/null @@ -1,151 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.*; - -import java.util.List; - -/** - * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-29-11:58 - * @Modify: - **/ -public class RequestModel { - - private List mesDefectRecordList; // 不良/缺陷记录数据集 - - private List mesRepairRecordList; // 维修记录数据集 - - private List dismantleRecordList; // 拆解记录数据集 - - private List workOrderList; // 工单数据集 - - private List partList; // 物料数据集 - - private List queueOrderList; // 生产队列数据集 - - private Double currentSeq; // 生产队列中的当前序列号 - - private Double nextSeq; // 生产队列中的下一个序列号 - - private Integer srcStatus; // 源状态 - - private Integer destStatus; // 目的状态 - - private List orderNoList;//工单编号 - - private ActionRequestBean actionRequestBean;//工单状态 - - public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { - this.queueOrderList = queueOrderList; - this.currentSeq = currentSeq; - this.nextSeq = nextSeq; - } - - public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { - this.queueOrderList = queueOrderList; - this.srcStatus = srcStatus; - this.destStatus = destStatus; - } - - public RequestModel(List workOrderList, List partList) { - this.workOrderList = workOrderList; - this.partList = partList; - } - - public List getMesDefectRecordList() { - return mesDefectRecordList; - } - - public void setMesDefectRecordList(List mesDefectRecordList) { - this.mesDefectRecordList = mesDefectRecordList; - } - - public List getMesRepairRecordList() { - return mesRepairRecordList; - } - - public void setMesRepairRecordList(List mesRepairRecordList) { - this.mesRepairRecordList = mesRepairRecordList; - } - - public List getDismantleRecordList() { - return dismantleRecordList; - } - - public void setDismantleRecordList(List dismantleRecordList) { - this.dismantleRecordList = dismantleRecordList; - } - - public List getWorkOrderList() { - return workOrderList; - } - - public RequestModel() { - } - - public void setWorkOrderList(List workOrderList) { - this.workOrderList = workOrderList; - } - - public List getPartList() { - return partList; - } - - public void setPartList(List partList) { - this.partList = partList; - } - - public List getQueueOrderList() { - return queueOrderList; - } - - public void setQueueOrderList(List queueOrderList) { - this.queueOrderList = queueOrderList; - } - - public void setOrderNoList(List orderNoList) { - this.orderNoList = orderNoList; - } - - public List getOrderNoList() { - return orderNoList; - } - - public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; } - - public ActionRequestBean getActionRequestBean() { return actionRequestBean; } - - public Double getCurrentSeq() { - return currentSeq == null ? 0.0d : currentSeq; - } - - public void setCurrentSeq(Double currentSeq) { - this.currentSeq = currentSeq; - } - - public Double getNextSeq() { - return nextSeq == null ? 0.0d : nextSeq; - } - - public void setNextSeq(Double nextSeq) { - this.nextSeq = nextSeq; - } - - public Integer getSrcStatus() { - return srcStatus == null ? 0 : srcStatus; - } - - public void setSrcStatus(Integer srcStatus) { - this.srcStatus = srcStatus; - } - - public Integer getDestStatus() { - return destStatus == null ? 0 : destStatus; - } - - public void setDestStatus(Integer destStatus) { - this.destStatus = destStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java deleted file mode 100644 index 831a997..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description: 打印信息封装 - * @Reference: - * @Author: wangjie - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息封装") -public class SnPrintDataModel { - - @ApiParam("打印数据") - private List valueList; - - @ApiParam("打印模板及参数") - private MesLabelTemplate labelTemplate; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java deleted file mode 100644 index 0f1d4a6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: 打印信息汇总 - * @Reference: - * @Author: wangjie - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息汇总") -public class SnPrintModel extends StepPrintSnModel { - - @ApiParam("过程条码") - private SnPrintDataModel serialPrintDataModel; - - @ApiParam("产品条码") - private SnPrintDataModel prodPrintDataModel; - - @ApiParam("包装条码") - private SnPrintDataModel packPrintDataModel; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java deleted file mode 100644 index e894595..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 3:11 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("工位BOM model") -public class StationBomModel extends MesStationBom { - - @ApiParam("上料数量") - private Long cellFeedQty; - - @ApiParam("是否上料数量满足") - private Boolean isFeedSatisfied; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java deleted file mode 100644 index 978fd4b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Description : 工位结果bean - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-24 - * @Modify: - **/ -@Data -public class StationResultBean implements Serializable { - - /** - * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 - * moduleContent组件内容,taskComplete整个扫描完成 - */ - @ApiParam("业务类型") - private String busiType; - - /** - * 对于相同业务类型的数据，区分不同数据类型。 - * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， - * image-图片 - */ - @ApiParam("数据类型") - private String dataType; - - @ApiParam("执行结果信息") - private String message; - - @ApiParam("List结果集") - private List resultList; - - @ApiParam("结果对象") - private Object resultObj; - - @ApiParam("Map结果集") - public Map resultMap; - - @ApiParam("List结果集的属性") - private List dataAttrList; - - @ApiParam("图片路径") - private String imageUrl; - - @ApiParam("多个数据集") - private List> stationResultBeans; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java deleted file mode 100644 index 7b2296f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/11/12 3:50 下午 - * @Description: 下拉工步参数对象 - **/ -@Data -@Api("下拉工步参数对象") -public class StepParamsModel implements Serializable { - private static final long serialVersionUID = -6361645141217616499L; - - @ApiParam("参数代码") - private String paramCode; - - @ApiParam("参数代码") - private Map paramValues; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java deleted file mode 100644 index c7f4937..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.beans.Transient; -import java.util.List; - -/** - * @Description: 打印条码工步， 打印信息模板 - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息模板") -public class StepPrintSnModel extends MesProduceSn { - @ApiParam("打印描述") - private String printDesc; - - @ApiParam("条码") - private String barCode; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("批次号") - private String batchNo; - - @ApiParam("箱数量") - private String boxQty; - - @ApiParam("订单号") - private String orderNo; - - @ApiParam("生产日期") - private String productionTime; - - @ApiParam("包装编码") - private String packageNo; - - @ApiParam("包装规格") - private String packageSpec; - - @ApiParam("供应商") - private String supplier; - - @ApiParam("客户名称") - private String customerName; - - @ApiParam("客户零件号") - private String customerPartNo; - - @ApiParam("客户物料名称") - private String customerPartName; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("单位") - private String unit; - - @ApiParam("特殊批号") - private String fixLotNo; - - @ApiParam("生产工单号") - private String workOrderNo; - - @ApiParam("生产线代码") - private String workCenterCode; - - @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") - private Integer packLevel; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java deleted file mode 100644 index ab30bd7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import lombok.Data; - -import java.util.Collection; - -@Data -@Api("工步返回信息") -public class StepResult { - - private boolean isCompleted; - - private T data; - - private Collection dataCollection; - - private String msg; - - public static StepResult getSuccessComplete() { - return new StepResult(true,""); - } - - public static StepResult getNonComplete() { - return new StepResult(false,""); - } - - public static StepResult getSuccessComplete(String msg) { - return new StepResult(true, msg); - } - - public static StepResult getNonComplete(String msg) { - return new StepResult(false, msg); - } - - public static StepResult getSuccessData(T data, String msg) { - return new StepResult<>(true, data, msg); - } - - public static StepResult getSuccessData(Collection data, String msg) { - return new StepResult(true, data, msg); - } - - private StepResult() { - } - - private StepResult(boolean isCompleted) { - this.isCompleted = isCompleted; - } - - private StepResult(boolean isCompleted, String msg) { - this.isCompleted = isCompleted; - this.msg = msg; - } - - public StepResult(boolean isCompleted, T data, String msg) { - this.isCompleted = isCompleted; - this.data = data; - this.msg = msg; - } - - public StepResult(boolean isCompleted, Collection dataCollection, String msg) { - this.isCompleted = isCompleted; - this.dataCollection = dataCollection; - this.msg = msg; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java deleted file mode 100644 index ad0541e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-06-03-11:44 - * @Modify: - **/ - -public class TorqueModel { - private Long id; - - private Double upperLimit; - - private Double lowerLimit; - - private Double torqueValue; - - private boolean ok; - - private String color; - - public boolean isOk() { - return ok; - } - - public void setOk(boolean ok) { - this.ok = ok; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Double getUpperLimit() { - return upperLimit; - } - - public void setUpperLimit(Double upperLimit) { - this.upperLimit = (upperLimit == null ? 0 : upperLimit); - } - - public Double getLowerLimit() { - return lowerLimit; - } - - public void setLowerLimit(Double lowerLimit) { - this.lowerLimit = (lowerLimit == null ? 0 : lowerLimit); - } - - public Double getTorqueValue() { - return torqueValue; - } - - public void setTorqueValue(Double torqueValue) { - this.torqueValue = (torqueValue == null ? 0 : torqueValue); - } - - public String getColor() { - return color; - } - - public void setColor(String color) { - this.color = color; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java deleted file mode 100644 index e1e1c93..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.*; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 8:06 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("开线管控model") -public class WcCheckModel { - - @ApiParam("工作中心") - private String workCenterCode; - - @ApiParam("工单") - private String workOrder; - - @ApiParam("产品号") - private String partNo; - - @ApiParam("是否通过") - private Integer isPass; - - @ApiParam("开线信号") - private Integer onlineSignal; - - @ApiParam("开线对象") - MesWcCheckRecord onlineSignalEqu; - - @ApiParam("需要展示的数据") - private Map titleMap; - - @ApiParam("对象list和列关系") - private Map> dataColumnRelation; - - @ApiParam("重构map") - private Map> dataMap; - - public WcCheckModel initialWcCheckModel() { - WcCheckModel wcCheckModel = new WcCheckModel(); - wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); - wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); - onlineSignalEqu = new MesWcCheckRecord(); - wcCheckModel.setTitleMap(new LinkedHashMap<>()); - wcCheckModel.setDataMap(new LinkedHashMap<>()); - wcCheckModel.setDataColumnRelation(new LinkedHashMap<>()); - return wcCheckModel; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java deleted file mode 100644 index 02bca6e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.IfDismantleRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 14:14 - * @Modify: - **/ -public interface IfDismantleRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java deleted file mode 100644 index 9a4d6be..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.IfPackageDetail; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 17:47 - * @Modify: - **/ -public interface IfPackageDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java deleted file mode 100644 index 9d362f1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.IfProductOffLine; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 17:48 - * @Modify: - **/ -public interface IfProductOffLineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java deleted file mode 100644 index 5f1dbef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionIf; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 11:21 - * @Modify: - **/ -public interface MesActionIfRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java deleted file mode 100644 index d5e2954..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionMethod; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesActionMethodRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java deleted file mode 100644 index 80cb307..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesAction; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesActionRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java deleted file mode 100644 index c91b713..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesAreaRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java deleted file mode 100644 index 42b5b30..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesBomRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java deleted file mode 100644 index 6153d23..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeedRecord; - -/** - * @Description : 工位投料履历持久化类 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2020-06-17 09:53 - * @Modify: - **/ -public interface MesCellFeedRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java deleted file mode 100644 index 462dff4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/18 10:05 AM - * @Description: - **/ -@Repository -public interface MesCellFeedRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java deleted file mode 100644 index 6b43fa6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Repository -public interface MesConfigRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java deleted file mode 100644 index cbca918..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustProdLine; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-19-11:15 - * @Modify: - **/ -@Repository -public interface MesCustProdLineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java deleted file mode 100644 index 72e72bc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomerPart; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-20 - * @Modify: - **/ -@Repository -public interface MesCustomerPartRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java deleted file mode 100644 index c006be6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomer; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-22-16:12 - * @Modify: - **/ -@Repository -public interface MesCustomerRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java deleted file mode 100644 index d285a59..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDataObject; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:59 PM - * @Description: - **/ -public interface MesDataObjectRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java deleted file mode 100644 index 36faed5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:58 PM - * @Description: - **/ -public interface MesDatasourceRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java deleted file mode 100644 index c0ecd89..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectCause; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:04 - * @Modify: - **/ -public interface MesDefectCauseRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java deleted file mode 100644 index c8a7a7b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:05 - * @Modify: - **/ -public interface MesDefectRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java deleted file mode 100644 index 274f334..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:04 - * @Modify: - **/ -public interface MesDefectRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java deleted file mode 100644 index e093fe2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDismantleRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:06 - * @Modify: - **/ -public interface MesDismantleRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java deleted file mode 100644 index 9d54073..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEquipment; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEquipmentRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java deleted file mode 100644 index 103e176..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesEsopRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java deleted file mode 100644 index 6b15531..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEventAction; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEventActionRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java deleted file mode 100644 index cfa330f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEvent; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEventRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java deleted file mode 100644 index 0050530..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFiCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesFiCfgRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java deleted file mode 100644 index 16383bc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesFileRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java deleted file mode 100644 index da57b4f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : crish - * @CreateDate : 2019-05-15 - * @Modify: - **/ -@Repository -public interface MesKpDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java deleted file mode 100644 index 373ab6d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpsnRule; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesKpsnRuleRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java deleted file mode 100644 index ce73083..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : - **/ -public interface MesLabelTemplateParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java deleted file mode 100644 index 16f04a4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : - **/ -public interface MesLabelTemplateRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java deleted file mode 100644 index d064c63..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMethod; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesMethodRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java deleted file mode 100644 index 46e8f5d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTaskDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 18:42 - */ -@Repository -public interface MesMonitorTaskDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java deleted file mode 100644 index f87ff43..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTask; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 18:43 - */ -@Repository -public interface MesMonitorTaskRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java deleted file mode 100644 index d3b014d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberRule; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 1:22 PM - * @Description: - **/ -@Repository -public interface MesNumberRuleRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java deleted file mode 100644 index 11299b0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberSerialno; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 1:23 PM - * @Description: - **/ - -@Repository -public interface MesNumberSerialnoRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java deleted file mode 100644 index c1a67b2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:59 PM - * @Description: - **/ -public interface MesObjectCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java deleted file mode 100644 index d10efa8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPLCConfigure; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPLCConfigureRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java deleted file mode 100644 index fc409e1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackSpec; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPackSpecRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java deleted file mode 100644 index 6d2fe27..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 10:33 上午 - * @Description: - **/ -public interface MesPackageDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java deleted file mode 100644 index eb7c894..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 10:39 上午 - * @Description: - **/ -public interface MesPackageRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java deleted file mode 100644 index dde5b62..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageTravel; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 2:57 下午 - * @Description: - **/ -public interface MesPackageTravelRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java deleted file mode 100644 index eb12a69..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPartCategory; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPartCategoryRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java deleted file mode 100644 index 0324dd1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPartRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java deleted file mode 100644 index 87029c6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesPatternJisRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java deleted file mode 100644 index c9e3e97..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnConnectLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnConnectLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java deleted file mode 100644 index 1ae09bf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcn; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java deleted file mode 100644 index 256e8da..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnSyncCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java deleted file mode 100644 index a217480..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncErrorLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnSyncErrorLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java deleted file mode 100644 index 111a055..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSysUserOffline; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-09-02 - * @Modify: - **/ -@Repository -public interface MesPcnSysUserOfflineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java deleted file mode 100644 index 66621f9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTaskLog; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-27 - * @Modify: - **/ -@Repository -public interface MesPcnTaskLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java deleted file mode 100644 index 68295ee..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTask; -import org.springframework.stereotype.Repository; - -/** - * @Description :mes-pcn定时任务清单 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-26 - * @Modify: - **/ -@Repository -public interface MesPcnTaskRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java deleted file mode 100644 index c4ba8c9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPlanOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:08 - * @Modify: - **/ -@Repository -public interface MesPlanOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java deleted file mode 100644 index add5aac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPlc; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/26 7:47 PM - * @Description: - **/ -@Repository -public interface MesPlcRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java deleted file mode 100644 index d931c12..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcess; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProcessRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java deleted file mode 100644 index 2b9ba19..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdBindRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdBindRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java deleted file mode 100644 index c93700b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfgDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdCfgDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java deleted file mode 100644 index 1413862..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java deleted file mode 100644 index cf70703..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdPack; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdPackRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java deleted file mode 100644 index 7a55397..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdRouteCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java deleted file mode 100644 index 93e532b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteOptParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdRouteOptParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java deleted file mode 100644 index 6827df9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdScatterCfgBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/9 0009 - 18:03 - */ -@Repository -public interface MesProdScatterCfgBomRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java deleted file mode 100644 index 50602d5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCategory; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-26-10:28 - * @Modify: - **/ -@Repository -public interface MesProduceCategoryRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java deleted file mode 100644 index 2edb306..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCtgyPicture; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:35 - * @Modify: - **/ -public interface MesProduceCtgyPictureRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java deleted file mode 100644 index e049715..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:10 - * @Modify: - **/ -@Repository -public interface MesProduceSnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java deleted file mode 100644 index 607e64c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel; -import org.springframework.stereotype.Repository; - -/** - * @Description : 条码履历Dao层接口 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 16:36 - * @Modify: - **/ -@Repository -public interface MesProduceSnTravelRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java deleted file mode 100644 index eb8debf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProductDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java deleted file mode 100644 index de434ac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductEncodeCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-04-17-17:10 - * @Modify: - **/ -@Repository -public interface MesProductEncodeCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java deleted file mode 100644 index 8c909e7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckData; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 16:43 - * @Modify: - **/ -public interface MesQcCheckDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java deleted file mode 100644 index 1348b9c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 14:58 - * @Modify: - **/ -public interface MesQcCheckStandardRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java deleted file mode 100644 index bd19fef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJisDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesQueueJisDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java deleted file mode 100644 index 8a08948..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJis; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesQueueJisRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java deleted file mode 100644 index 82bbefb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrderDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:12 - * @Modify: - **/ -@Repository -public interface MesQueueOrderDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java deleted file mode 100644 index 989e14f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:11 - * @Modify: - **/ -@Repository -public interface MesQueueOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java deleted file mode 100644 index 1f048c1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/18 10:05 AM - * @Description: - **/ -@Repository -public interface MesRawPartSnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java deleted file mode 100644 index 1325e76..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepairRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:06 - * @Modify: - **/ -public interface MesRepairRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java deleted file mode 100644 index 2e22c77..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepair; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-08-17:13 - * @Modify: - **/ -@Repository -public interface MesRepairRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java deleted file mode 100644 index f217869..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRouteProcessCell; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteProcessCellRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java deleted file mode 100644 index 5749bbd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRouteProcess; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteProcessRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java deleted file mode 100644 index 92800fd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRoute; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java deleted file mode 100644 index 0f3e5eb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrapRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:07 - * @Modify: - **/ -public interface MesScrapRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java deleted file mode 100644 index 4dbf260..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrap; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-08-17:13 - * @Modify: - **/ -@Repository -public interface MesScrapRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java deleted file mode 100644 index 544c627..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShiftGroup; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-18-17:13 - * @Modify: - **/ -@Repository -public interface MesShiftGroupRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java deleted file mode 100644 index 7f5b1a7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShift; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-19-13:53 - * @Modify: - **/ -@Repository -public interface MesShiftRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java deleted file mode 100644 index b3cc087..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShiftRest; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-20 - * @Modify: - **/ -@Repository -public interface MesShiftRestRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java deleted file mode 100644 index f5fd71f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStationBomRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java deleted file mode 100644 index f7b386f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStepParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStepParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java deleted file mode 100644 index 5f3f562..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStepRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java deleted file mode 100644 index 6489cec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTime; -import org.springframework.stereotype.Repository; - -@Repository -public interface MesTimeRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java deleted file mode 100644 index d2be5f1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTorqueDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesTorqueDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java deleted file mode 100644 index 02911ac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTypeCfg; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\12\4 10:34 - * @Modify: - **/ -public interface MesTypeCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java deleted file mode 100644 index 71d7efa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 7:30 PM - * @Description: - **/ -public interface MesWcCheckRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java deleted file mode 100644 index cbf9cae..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheck; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 7:30 PM - * @Description: - **/ -public interface MesWcCheckRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java deleted file mode 100644 index 0e70427..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/28 12:04 PM - * @Description: - **/ -public interface MesWcEquipmentRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java deleted file mode 100644 index 672947b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellMonitorLog; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:58 PM - * @Description: - **/ -public interface MesWorkCellMonitorLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java deleted file mode 100644 index 98f4a1c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParamCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellParamCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java deleted file mode 100644 index 3a714cf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-30 - * @Modify: - **/ -@Repository -public interface MesWorkCellParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java deleted file mode 100644 index 52319d0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint; -import org.springframework.stereotype.Repository; - -/** - * @Description :工站队列Dao层接口 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 14:40 - * @Modify: - **/ -@Repository -public interface MesWorkCellPointRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java deleted file mode 100644 index ce59423..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java deleted file mode 100644 index 1295a8d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellStatus; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 11:21 - * @Modify: - **/ -@Repository -public interface MesWorkCellStatusRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java deleted file mode 100644 index e24b5db..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCenter; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCenterRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java deleted file mode 100644 index fea2dfb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrderLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-19-17:13 - * @Modify: - **/ -@Repository -public interface MesWorkOrderLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java deleted file mode 100644 index 40676c4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:13 - * @Modify: - **/ -@Repository -public interface MesWorkOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java deleted file mode 100644 index 4120d0e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ /dev/null @@ -1,411 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.sqlpack; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.pcn.bean.*; -import org.springframework.util.StringUtils; - -/** - * @Description: - * @Reference: Mes 条件封装 - * @Author: Crish - * @CreateDate:2019-04-22-14:58 - * @Modify: - **/ -public class MesHqlPack { - - - /** - * 通用查询条件 - * - * @param organizeCode - * @return - */ - public static DdlPackBean getAllBaseData(String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - return packBean; - } - - /** - * 通用查询条件 - * - * @param organizeCode - * @return - */ - public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - return packBean; - } - - /** - * MES PCN系统配置信息条件查询 - * - * @param mesConfig - * @return - */ - public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); - } - if (!StringUtils.isEmpty(mesConfig.getCfgName())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); - } - if (!StringUtils.isEmpty(mesConfig.getIsValid())) { - DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); - } - return packBean; - } - - /** - * 根据打印模板的模板代码查询模板信息 - * - * @param mesLabelTemplate - * @return - */ - public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); - return packBean; - } - - /** - * 获取工作中心下所有的投料数据 - * - * @param mesCellFeed - * @param org - * @return - */ - public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { - DdlPackBean packBean = getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); - return packBean; - } - - - /** - * 获取原材料扫描信息的对应工序BOM - * - * @param stationBom - * @param rawPartSn - * @return - */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { - DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); - DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); - return packBean; - } - - /** - * 生产工单查询条件封装 - * - * @param mesWorkOrder - * @return - */ - public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); - } else { - if (!StringUtils.isEmpty(mesWorkOrder.getPageType()) && "1".equals(mesWorkOrder.getPageType())) { - DdlPreparedPack.getInPackArray(new Object[]{MesPcnEnumUtil.WORK_ORDER_STATUS.OPEN.getValue(), MesPcnEnumUtil.WORK_ORDER_STATUS.PAUSE.getValue(), - MesPcnEnumUtil.WORK_ORDER_STATUS.COMPLETE.getValue()}, "workOrderStatus", packBean); - } - } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getApprovalStatus())) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getIsValid())) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); - } - - // 时间段查询 - if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesWorkOrder.getStartTimeStart(), - mesWorkOrder.getStartTimeEnd(), - "startTime", packBean, true); - } - if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesWorkOrder.getEndTimeStart(), - mesWorkOrder.getEndTimeEnd(), - "endTime", packBean, true); - } - if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesWorkOrder.getCreateDateTimeStart(), - mesWorkOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - } - return packBean; - } - - /** - * 物料信息查询条件封装 - * - * @param mesPart - * @return - */ - public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - - if (!StringUtils.isEmpty(mesPart.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); - } - if (!StringUtils.isEmpty(mesPart.getPartName())) { - DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); - } - if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) { - DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); - } - if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) { - DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); - } - if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { - DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); - } - return packBean; - } - - /** - * MES 客户信息查询条件封装 - * - * @param customer - * @return - */ - public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); - if (!StringUtils.isEmpty(customer.getCustomerCode())) { - DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); - } - if (!StringUtils.isEmpty(customer.getCustomerName())) { - DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); - } - - return packBean; - } - - /** - * MES PCN系维修信息条件查询 - * - * @param mesRepair - * @return - */ - public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesRepair.getRepairCode())) { - DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); - } - if (!StringUtils.isEmpty(mesRepair.getRepairName())) { - DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); - } - if (!StringUtils.isEmpty(mesRepair.getRepairType())) { - DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); - } - return packBean; - } - - /** - * MES PCN系维修信息条件查询 - * - * @param mesScrap - * @return - */ - public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesScrap.getScrapCode())) { - DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); - } - if (!StringUtils.isEmpty(mesScrap.getScrapName())) { - DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); - } - if (!StringUtils.isEmpty(mesScrap.getScrapType())) { - DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean); - } - return packBean; - } - - /** - * MES PCN缺陷原因信息条件查询 - * - * @param mesDefectCause - * @return - */ - public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) { - DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean); - } - if (!StringUtils.isEmpty(mesDefectCause.getDcName())) { - DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean); - } - if (!StringUtils.isEmpty(mesDefectCause.getDcType())) { - DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean); - } - return packBean; - } - - /** - * 按条件分页查询产品条码补打印数据 - * @param mesProduceSn - * @return - */ - public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { - DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); - if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { - DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); - } - - // 时间段查询 - if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesProduceSn.getCreateDateTimeStart(), - mesProduceSn.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - } - if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesProduceSn.getOutWorkCenterTimeStart(), - mesProduceSn.getOutWorkCenterTimeEnd(), - "outWorkCenterTime", packBean, true); - } - return packBean; - } - - /** - * 按条件分页查询包装条码补打印数据 - * @param mesPackage - * @return - */ - public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) { - - DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode()); - if (!StringUtils.isEmpty(mesPackage.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { - DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); - } - - // 时间段查询 - DdlPreparedPack.timeBuilder( - mesPackage.getCreateDateTimeStart(), - mesPackage.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - - return packBean; - } - - - /** - * MES班组信息查询条件封装 - * - * @param shiftGroup - * @param organizeCode - * @return - */ - public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { - - DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); - if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) { - DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); - } - if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { - DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); - } - if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean); - } - return packBean; - } - - public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { - DdlPackBean packBean = getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); - return packBean; - } - - - - /** - * 按条件分页查询类型信息数据 - * @param typeCfg - * @return - */ - public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) { - - DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode()); - if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) { - DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); - } - if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) { - DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean); - } - if (!StringUtils.isEmpty(typeCfg.getTypeCode())) { - DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean); - } - - return packBean; - } -} From 46cc056a432504d6c027701cd7ebc03ceadcbb67 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 27 Nov 2020 15:03:20 +0800 Subject: [PATCH 177/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java | 5 +++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java index 56e1cb7..1cf909c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java @@ -3,9 +3,7 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -31,6 +29,9 @@ public class DynTableRow implements Serializable { // 行Size private Integer cellSize = 0; + //时间 + private String createDatetime; + // 行数据 private Map cellMap = new HashMap<>(); 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 cb532b0..88f58f3 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 @@ -385,6 +385,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "实际发运时间") private String actualPlanTime; + @Transient + @ApiParam(value = "目的库位名称") + public String destLocateName; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -715,4 +719,12 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } + public WmsDocMovementDetails(String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo, String locateName) { + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.destLocateName = locateName; + } + } From bdf8e0d78210d06acf194d8131a164455a5be4ae Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 27 Nov 2020 18:13:30 +0800 Subject: [PATCH 178/329] =?UTF-8?q?=E9=94=99=E8=AF=AFpojo=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java index aede8be..cd07cd9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java @@ -27,7 +27,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_MODULE") -@Api("作业程序组件参数") +@Api("工作单元组件配置") public class MesWorkCellModule extends BaseBean implements Serializable { private static final long serialVersionUID = -3537487776977917751L; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java index de64920..921c2bf 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/BasBeanInfoModel.java @@ -9,7 +9,7 @@ import java.io.Serializable; import java.util.List; /** - * @Description : Wms实体字段Model信息 + * @Description : mes实体字段Model信息 * @Reference : * @Author : siliter.yuan * @CreateDate : 2020-04-24 09:53 From ad0325f7df980c28e99474002a5e15379540641e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 27 Nov 2020 19:22:39 +0800 Subject: [PATCH 179/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index d5df633..dc69e01 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -25,9 +25,16 @@ public class WmsStockFifoModel { @ApiParam(value = "物料集合") List partNos; + @ApiParam(value = "物料") + String partNo; + @ApiParam(value = "存储区集合") List zoneNos; + @ApiParam(value = "存储区") + String zoneNo; + + @ApiParam(value = "物料对应的存储区") Map partToZoneMap; From 2a94ce3e0e3dd0b3eb1f7ab5aa7063768df15e20 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 27 Nov 2020 19:37:57 +0800 Subject: [PATCH 180/329] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java index 96f3c6a..37058a9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail; +import org.springframework.stereotype.Repository; /** @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail; * @CreateDate: 2019/10/19 10:33 上午 * @Description: **/ +@Repository public interface MesPackageDetailRepository extends BaseRepository { } From 970f75f8cf29495b078df56fcd6bf71671c46a83 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 27 Nov 2020 20:36:01 +0800 Subject: [PATCH 181/329] =?UTF-8?q?=E9=98=9F=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E7=BB=84=E5=8F=B7=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/MesQueueOrder.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 6f6b2bb..5838d4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("工作中心") private String workCenterCode; + @Column(name = "GROUP_NO") + @ApiParam("分组号") + private String groupNo; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index ef5f899..5807d66 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -79,6 +79,9 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("工位名称") private String workCellName; + @ApiParam("工位描述") + private String workCellDesc; + @ApiParam("x坐标内容") private List xAxisList; From 7be62a939bf59c47c033f92e7b1cf0974663626a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Nov 2020 09:23:25 +0800 Subject: [PATCH 182/329] =?UTF-8?q?TJ=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 116caa0..4308bde 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -28,6 +28,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_ORDER", indexes = { @Index(columnList = "ORDER_NO"), + @Index(columnList = "AREA_CODE"), @Index(columnList = "WORK_CENTER_CODE"), @Index(columnList = "WO_STATUS") }, uniqueConstraints = { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index c77b789..2eca8bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -43,6 +43,9 @@ public class TJMgnBoardModel extends BaseBean implements Serializable { @ApiParam("不合格数量") private Double noQuQty; + @ApiParam("待定数量") + private Double determindQty; + @ApiParam("一次合格率") private String firstPassRate; From d9b4a8eb4d5f900a9c6c157ddee8e58364efca6a Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 30 Nov 2020 09:45:22 +0800 Subject: [PATCH 183/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java index 2f35bf8..97527e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java @@ -8,7 +8,12 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -25,6 +30,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BLIND_HISTORY") @Api("MES_盲检记录") +@Inheritance(strategy = InheritanceType.JOINED) public class MesBlindHistory extends BaseBean implements Serializable { private static final long serialVersionUID = -7459452475180601499L; From 19636e308e381bc31beeae7cf0df96fc5cb6a4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 30 Nov 2020 11:35:39 +0800 Subject: [PATCH 184/329] =?UTF-8?q?=E3=80=9012645=2019048-=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E8=B4=A8=E6=A3=80=E6=8A=A5=E8=A1=A8=E7=94=A8=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E5=92=8C=E7=BB=93=E6=9D=9F=E5=B7=A5=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=A0=E5=8F=8D=E5=BA=94-20201123=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/mes/bean/IfProductOffLine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index ea3844d..ff25483 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -169,12 +169,13 @@ public class IfProductOffLine extends BaseBean implements Serializable { this.qcStatus = qcStatus; } - public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime) { + public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) { this.workCenterCode = workCenterCode; this.partNo = partNo; this.partName = partName; this.packageNo = packageNo; this.qty = qty; this.createDatetime = createDatetime; + this.workOrderNo = workOrderNo; } } From 4a38aab5b6705c61882799f662b39a4df6762a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 30 Nov 2020 13:13:30 +0800 Subject: [PATCH 185/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2989?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 7 +++++++ 2 files changed, 15 insertions(+) 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 eac12a1..1d45817 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 @@ -154,6 +154,14 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("备注") private String remark; + @Column(name = "REMARK1") + @ApiParam("备注1") + private String remark1; + + @Column(name = "REMARK2") + @ApiParam("备注2") + private String remark2; + @Transient @ApiParam(value = "散件收货输入数量", example = "0") private Double inputRcQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index c414b10..7d9a8fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -179,6 +179,13 @@ public class WmsPoSn extends BaseBean { @ApiParam("物料库位") private String partLocateNo; + @Transient + @ApiParam("备注1") + private String remark1; + + @Transient + @ApiParam("备注2") + private String remark2; public WmsPoSn(){} From ca18bb40cd4497d3bd5f8c34c3cd277350d9cb2f Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 30 Nov 2020 14:18:39 +0800 Subject: [PATCH 186/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=9D=A1=E7=A0=81=EF=BC=9A=E5=8D=95=E6=8D=AE=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=A2=9E=E5=8A=A0=E8=A1=8C=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 d549c1f..c5215d6 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 @@ -2030,8 +2030,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); - DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getSrcLocateNo(), "srcLocateNo", result); - DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getDestLocateNo(), "destLocateNo", result); + if (!StringUtil.isEmpty(wmsDocMovementSn.getItem())) { + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result); + } DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); @@ -2039,6 +2040,7 @@ public class WmsHqlPack { return result; } + /** * 移库单订单条码表 分页查询 * From 7ecbed2cda81eb1e924bf84560ff406623296581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Nov 2020 15:02:06 +0800 Subject: [PATCH 187/329] =?UTF-8?q?fix(order):=E6=9C=AA=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 6bb092f..ed8ce43 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -63,9 +64,15 @@ public class SysOrderNoRule extends BaseBean { @Column(name = "IS_CYCLE") @ApiParam(value = "达到最大值后是否循环",example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isCycle; + @Column(name = "IS_FIXED_LENGTH") + @ColumnDefault("2") + @ApiParam(value = "是否固定序号长度长度",example = "1") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isFixedLength; + @Column(name = "SERIAL_NO") @ApiParam(value = "当前流水号",example = "-1") @JsonSerialize(using = ToStringSerializer.class) From 7b17ecbb299b01b44755e1678390408aec918726 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 30 Nov 2020 17:35:49 +0800 Subject: [PATCH 188/329] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 55 +++ .../pojo/mes/pcn/bean/IfDismantleRecord.java | 105 ++++++ .../i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 100 +++++ .../i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 88 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesAction.java | 48 +++ .../i3plus/pojo/mes/pcn/bean/MesActionIf.java | 40 ++ .../i3plus/pojo/mes/pcn/bean/MesActionMethod.java | 49 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 59 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java | 90 +++++ .../i3plus/pojo/mes/pcn/bean/MesCachaQueue.java | 45 +++ .../i3plus/pojo/mes/pcn/bean/MesCellFeed.java | 79 ++++ .../pojo/mes/pcn/bean/MesCellFeedRecord.java | 74 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesCustProdLine.java | 40 ++ .../i3plus/pojo/mes/pcn/bean/MesCustomer.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesCustomerPart.java | 49 +++ .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 71 ++++ .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 82 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 81 ++++ .../i3plus/pojo/mes/pcn/bean/MesDefectCause.java | 44 +++ .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 80 ++++ .../pojo/mes/pcn/bean/MesDismantleRecord.java | 97 +++++ .../pojo/mes/pcn/bean/MesEquAlarmRecord.java | 53 +++ .../i3plus/pojo/mes/pcn/bean/MesEquipment.java | 97 +++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java | 93 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java | 52 +++ .../i3plus/pojo/mes/pcn/bean/MesEventAction.java | 54 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java | 47 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java | 59 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java | 65 ++++ .../i3plus/pojo/mes/pcn/bean/MesKpsnRule.java | 95 +++++ .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 54 +++ .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 55 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java | 55 +++ .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 52 +++ .../pojo/mes/pcn/bean/MesMonitorTaskDetail.java | 48 +++ .../i3plus/pojo/mes/pcn/bean/MesNumberRule.java | 60 +++ .../pojo/mes/pcn/bean/MesNumberSerialno.java | 49 +++ .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 60 +++ .../i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 62 ++++ .../i3plus/pojo/mes/pcn/bean/MesPackSpec.java | 99 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 119 ++++++ .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 63 ++++ .../i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 58 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 93 +++++ .../i3plus/pojo/mes/pcn/bean/MesPartCategory.java | 44 +++ .../i3plus/pojo/mes/pcn/bean/MesPartFormula.java | 45 +++ .../i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 68 ++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 87 +++++ .../i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java | 55 +++ .../i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java | 92 +++++ .../pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 54 +++ .../pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 70 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 90 +++++ .../i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java | 53 +++ .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 144 +++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 112 ++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java | 39 ++ .../pojo/mes/pcn/bean/MesProdBindRecord.java | 106 ++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java | 44 +++ .../i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java | 53 +++ .../i3plus/pojo/mes/pcn/bean/MesProdPack.java | 69 ++++ .../i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 45 +++ .../pojo/mes/pcn/bean/MesProdRouteOptParam.java | 71 ++++ .../pojo/mes/pcn/bean/MesProdScatterCfgBom.java | 55 +++ .../pojo/mes/pcn/bean/MesProduceCategory.java | 40 ++ .../pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 205 ++++++++++ .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 154 ++++++++ .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 109 ++++++ .../pojo/mes/pcn/bean/MesProductEncodeCfg.java | 50 +++ .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 107 ++++++ .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 108 ++++++ .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 71 ++++ .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 62 ++++ .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 90 +++++ .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 103 +++++ .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 78 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 44 +++ .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 102 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 51 +++ .../i3plus/pojo/mes/pcn/bean/MesRouteProcess.java | 64 ++++ .../pojo/mes/pcn/bean/MesRouteProcessCell.java | 44 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java | 45 +++ .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 71 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 68 ++++ .../i3plus/pojo/mes/pcn/bean/MesShiftGroup.java | 47 +++ .../i3plus/pojo/mes/pcn/bean/MesShiftRest.java | 49 +++ .../pojo/mes/pcn/bean/MesSnPhotoRelation.java | 45 +++ .../i3plus/pojo/mes/pcn/bean/MesStationBom.java | 151 ++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java | 102 +++++ .../i3plus/pojo/mes/pcn/bean/MesStepParam.java | 47 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java | 40 ++ .../i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 97 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java | 48 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 83 +++++ .../i3plus/pojo/mes/pcn/bean/MesWcEquipment.java | 43 +++ .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 64 ++++ .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 64 ++++ .../i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java | 48 +++ .../pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java | 56 +++ .../pojo/mes/pcn/bean/MesWorkCellStatus.java | 47 +++ .../i3plus/pojo/mes/pcn/bean/MesWorkCenter.java | 57 +++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 249 +++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 231 ++++++++++++ .../pojo/mes/pcn/model/ActionRequestBean.java | 38 ++ .../estsh/i3plus/pojo/mes/pcn/model/AttrBean.java | 17 + .../i3plus/pojo/mes/pcn/model/ButtonBean.java | 22 ++ .../pojo/mes/pcn/model/DataAcquisitionModel.java | 35 ++ .../i3plus/pojo/mes/pcn/model/DefectModel.java | 50 +++ .../i3plus/pojo/mes/pcn/model/EsopFileModel.java | 26 ++ .../pojo/mes/pcn/model/FastDfsDownloadModel.java | 31 ++ .../pojo/mes/pcn/model/GenSerialNoModel.java | 72 ++++ .../pojo/mes/pcn/model/MesButtonFlagModel.java | 57 +++ .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 35 ++ .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 126 +++++++ .../pojo/mes/pcn/model/MesStationBomModel.java | 75 ++++ .../pojo/mes/pcn/model/PLCInteracticeModel.java | 50 +++ .../pojo/mes/pcn/model/PcsObserverStatusModel.java | 25 ++ .../pojo/mes/pcn/model/ProdPackageModel.java | 78 ++++ .../pojo/mes/pcn/model/ProductDataModel.java | 24 ++ .../pojo/mes/pcn/model/QcCheckStandardModel.java | 25 ++ .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 90 +++++ .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 83 +++++ .../i3plus/pojo/mes/pcn/model/RequestModel.java | 155 ++++++++ .../pojo/mes/pcn/model/SnPrintDataModel.java | 27 ++ .../i3plus/pojo/mes/pcn/model/SnPrintModel.java | 27 ++ .../i3plus/pojo/mes/pcn/model/StationBomModel.java | 29 ++ .../pojo/mes/pcn/model/StationResultBean.java | 55 +++ .../i3plus/pojo/mes/pcn/model/StepParamsModel.java | 29 ++ .../pojo/mes/pcn/model/StepPrintSnModel.java | 79 ++++ .../i3plus/pojo/mes/pcn/model/StepResult.java | 69 ++++ .../i3plus/pojo/mes/pcn/model/TorqueModel.java | 71 ++++ .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 63 ++++ .../repository/IfDismantleRecordRepository.java | 14 + .../pcn/repository/IfPackageDetailRepository.java | 14 + .../pcn/repository/IfProductOffLineRepository.java | 14 + .../mes/pcn/repository/MesActionIfRepository.java | 14 + .../pcn/repository/MesActionMethodRepository.java | 16 + .../mes/pcn/repository/MesActionRepository.java | 17 + .../pojo/mes/pcn/repository/MesAreaRepository.java | 16 + .../pojo/mes/pcn/repository/MesBomRepository.java | 16 + .../repository/MesCellFeedRecordRepository.java | 14 + .../mes/pcn/repository/MesCellFeedRepository.java | 14 + .../mes/pcn/repository/MesConfigRepository.java | 17 + .../pcn/repository/MesCustProdLineRepository.java | 16 + .../pcn/repository/MesCustomerPartRepository.java | 17 + .../mes/pcn/repository/MesCustomerRepository.java | 17 + .../pcn/repository/MesDataObjectRepository.java | 13 + .../pcn/repository/MesDatasourceRepository.java | 13 + .../pcn/repository/MesDefectCauseRepository.java | 14 + .../pcn/repository/MesDefectRecordRepository.java | 14 + .../mes/pcn/repository/MesDefectRepository.java | 14 + .../repository/MesDismantleRecordRepository.java | 14 + .../mes/pcn/repository/MesEquipmentRepository.java | 16 + .../pojo/mes/pcn/repository/MesEsopRepository.java | 17 + .../pcn/repository/MesEventActionRepository.java | 17 + .../mes/pcn/repository/MesEventRepository.java | 17 + .../mes/pcn/repository/MesFiCfgRepository.java | 17 + .../pojo/mes/pcn/repository/MesFileRepository.java | 16 + .../mes/pcn/repository/MesKpDataRepository.java | 17 + .../mes/pcn/repository/MesKpsnRuleRepository.java | 16 + .../MesLabelTemplateParamRepository.java | 14 + .../pcn/repository/MesLabelTemplateRepository.java | 14 + .../mes/pcn/repository/MesMethodRepository.java | 17 + .../repository/MesMonitorTaskDetailRepository.java | 15 + .../pcn/repository/MesMonitorTaskRepository.java | 15 + .../pcn/repository/MesNumberRuleRepository.java | 15 + .../repository/MesNumberSerialnoRepository.java | 16 + .../mes/pcn/repository/MesObjectCfgRepository.java | 13 + .../pcn/repository/MesPLCConfigureRepository.java | 16 + .../mes/pcn/repository/MesPackSpecRepository.java | 16 + .../pcn/repository/MesPackageDetailRepository.java | 13 + .../mes/pcn/repository/MesPackageRepository.java | 13 + .../pcn/repository/MesPackageTravelRepository.java | 13 + .../pcn/repository/MesPartCategoryRepository.java | 16 + .../pojo/mes/pcn/repository/MesPartRepository.java | 16 + .../pcn/repository/MesPatternJisRepository.java | 16 + .../pcn/repository/MesPcnConnectLogRepository.java | 16 + .../pojo/mes/pcn/repository/MesPcnRepository.java | 16 + .../pcn/repository/MesPcnSyncCfgRepository.java | 16 + .../repository/MesPcnSyncErrorLogRepository.java | 16 + .../repository/MesPcnSysUserOfflineRepository.java | 16 + .../pcn/repository/MesPcnTaskLogRepository.java | 16 + .../mes/pcn/repository/MesPcnTaskRepository.java | 16 + .../mes/pcn/repository/MesPlanOrderRepository.java | 16 + .../pojo/mes/pcn/repository/MesPlcRepository.java | 15 + .../mes/pcn/repository/MesProcessRepository.java | 16 + .../repository/MesProdBindRecordRepository.java | 16 + .../pcn/repository/MesProdCfgDetailRepository.java | 16 + .../mes/pcn/repository/MesProdCfgRepository.java | 16 + .../mes/pcn/repository/MesProdPackRepository.java | 16 + .../pcn/repository/MesProdRouteCfgRepository.java | 16 + .../repository/MesProdRouteOptParamRepository.java | 16 + .../repository/MesProdScatterCfgBomRepository.java | 16 + .../repository/MesProduceCategoryRepository.java | 16 + .../MesProduceCtgyPictureRepository.java | 14 + .../mes/pcn/repository/MesProduceSnRepository.java | 16 + .../repository/MesProduceSnTravelRepository.java | 17 + .../pcn/repository/MesProductDataRepository.java | 16 + .../repository/MesProductEncodeCfgRepository.java | 16 + .../pcn/repository/MesQcCheckDataRepository.java | 14 + .../repository/MesQcCheckStandardRepository.java | 14 + .../repository/MesQueueJisDetailRepository.java | 16 + .../mes/pcn/repository/MesQueueJisRepository.java | 16 + .../repository/MesQueueOrderDetailRepository.java | 16 + .../pcn/repository/MesQueueOrderRepository.java | 16 + .../mes/pcn/repository/MesRawPartSnRepository.java | 15 + .../pcn/repository/MesRepairRecordRepository.java | 14 + .../mes/pcn/repository/MesRepairRepository.java | 16 + .../repository/MesRouteProcessCellRepository.java | 16 + .../pcn/repository/MesRouteProcessRepository.java | 16 + .../mes/pcn/repository/MesRouteRepository.java | 16 + .../pcn/repository/MesScrapRecordRepository.java | 14 + .../mes/pcn/repository/MesScrapRepository.java | 16 + .../pcn/repository/MesShiftGroupRepository.java | 16 + .../mes/pcn/repository/MesShiftRepository.java | 17 + .../mes/pcn/repository/MesShiftRestRepository.java | 16 + .../pcn/repository/MesStationBomRepository.java | 16 + .../mes/pcn/repository/MesStepParamRepository.java | 16 + .../pojo/mes/pcn/repository/MesStepRepository.java | 16 + .../pojo/mes/pcn/repository/MesTimeRepository.java | 10 + .../pcn/repository/MesTorqueDetailRepository.java | 17 + .../mes/pcn/repository/MesTypeCfgRepository.java | 14 + .../pcn/repository/MesWcCheckRecordRepository.java | 13 + .../mes/pcn/repository/MesWcCheckRepository.java | 13 + .../pcn/repository/MesWcEquipmentRepository.java | 13 + .../MesWorkCellMonitorLogRepository.java | 13 + .../repository/MesWorkCellParamCfgRepository.java | 16 + .../pcn/repository/MesWorkCellParamRepository.java | 16 + .../pcn/repository/MesWorkCellPointRepository.java | 17 + .../mes/pcn/repository/MesWorkCellRepository.java | 16 + .../repository/MesWorkCellStatusRepository.java | 16 + .../pcn/repository/MesWorkCenterRepository.java | 16 + .../pcn/repository/MesWorkOrderLogRepository.java | 16 + .../mes/pcn/repository/MesWorkOrderRepository.java | 16 + .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 413 +++++++++++++++++++++ 239 files changed, 11373 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/pom.xml create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml new file mode 100644 index 0000000..bf96e57 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -0,0 +1,55 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-TEST-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-mes-pcn + jar + + + + i3plus.pojo + i3plus-pojo-base + + + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${project.version} + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java new file mode 100644 index 0000000..eb147e3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java @@ -0,0 +1,105 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\14 19:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_DISMENTLE_RECORD") +@Api("物料拆解表") +public class IfDismantleRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6010207359066736962L; + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Double qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private BigDecimal okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private BigDecimal missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private BigDecimal scrapQty; + + @Column(name = "LOT_NO") + @ApiParam("批次") + private String lotNo; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java new file mode 100644 index 0000000..651f8dc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE_DETAIL") +@Api("包装明细表") +public class IfPackageDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1873101288426218272L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "LOT_NO") + @ApiParam("包装批次") + private String lotNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编号2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编号3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编号4") + private String packageNo4; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java new file mode 100644 index 0000000..367bb1c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java @@ -0,0 +1,88 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PRODUCT_OFF_LINE") +@Api("生产报工表") +public class IfProductOffLine extends BaseBean implements Serializable { + + private static final long serialVersionUID = 200629529131241418L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java new file mode 100644 index 0000000..ac19407 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION") +@Api("mes系统业务动作") +public class MesAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -6451213228967727835L; + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_NAME") + @ApiParam("动作名称") + private String actionName; + + @Column(name = "ACTION_TYPE") + @ApiParam("动作类型") + private Integer actionType; + + public int getActionTypeVal() { + return this.actionType == null ? 0 : this.actionType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java new file mode 100644 index 0000000..eafb489 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_IF") +@Api("动作接口配置") +public class MesActionIf extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5058215339453766620L; + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java new file mode 100644 index 0000000..b38452f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务动作方法 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_METHOD") +@Api("系统业务动作方法") +public class MesActionMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = 6249418690993577108L; + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java new file mode 100644 index 0000000..d1910a3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.List; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean implements Serializable { + private static final long serialVersionUID = 1047604067591557689L; + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + + @Transient + @ApiParam(value = "子集列表") + private List childTreeList; + + @Transient + @ApiParam(value = "名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value = "父节点", access = "父节点", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java new file mode 100644 index 0000000..7471095 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :BOM清单 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOM") +@Api("BOM清单") +public class MesBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -1772273641263268564L; + @Column(name = "PART_NO") + @ApiParam("父零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("父零件名称") + private String partName; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + private Double qty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子零件") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子零件名称") + private String itemPartName; + + @Column(name = "ITEM_UNIT") + @ApiParam(value = "子零件单位") + private String itemUnit; + + @Column(name = "ITEM_QTY") + @ColumnDefault("0") + @ApiParam(value = "子零件数量", example = "0") + private Double itemQty; + + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本") + private String bomVersion; + + @Column(name = "EFF_START_TIME") + @ApiParam(value = "生效时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String effStartTime; + + @Column(name = "EFF_END_TIME") + @ApiParam(value = "失效时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String effEndTime; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getitemQtyVal() { + return this.itemQty == null ? 0.0d : this.itemQty; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java new file mode 100644 index 0000000..fd9c366 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 15:09 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CACHA_QUEUE") +@Api("MES缓存队列") +public class MesCachaQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8272649623030195332L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CACHA_TYPE") + @ApiParam("缓存类型") + private String cachaType; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java new file mode 100644 index 0000000..60e2d1d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Version; +import java.io.Serializable; + +/** + * @Description :工位投料信息 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CELL_FEED") +@Api("工位投料信息") +public class MesCellFeed extends BaseBean implements Serializable { + private static final long serialVersionUID = 2412657464618960515L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("特殊批次") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java new file mode 100644 index 0000000..6464445 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工位投料履历信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CELL_FEED_RECORD") +@Api("工位投料履历信息") +public class MesCellFeedRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971379489107783L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("原材料数量") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java new file mode 100644 index 0000000..f8b9558 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :配置表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONFIG") +@Api("mes配置表") +public class MesConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = -5759669472714287000L; + @Column(name = "CFG_CODE") + @ApiParam("配置代码") + private String cfgCode; + + @Column(name = "CFG_NAME") + @ApiParam("配置名称") + private String cfgName; + + @Column(name = "CFG_TYPE") + @ApiParam("配置类型") + private String cfgType; + + @Column(name = "CFG_KEY") + @ApiParam("配置key") + private String cfgKey; + + @Column(name = "CFG_VALUE") + @ApiParam("配置value") + private String cfgValue; + + @Column(name = "CFG_VAULE_DESC") + @ApiParam("配置value描述") + private String cfgValueDesc; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java new file mode 100644 index 0000000..8e9a363 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUST_PROD_LINE") +@Api("客户产线代码") +public class MesCustProdLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 3049432665592161513L; + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "CUST_PROD_LINE_NAME") + @ApiParam("客户产线名称") + private String custProdLineName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java new file mode 100644 index 0000000..21f2ad1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes客户表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-04-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER") +@Api("客户信息") +public class MesCustomer extends BaseBean implements Serializable { + private static final long serialVersionUID = 167635887082538926L; + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_NAME") + @ApiParam("客户名称") + private String customerName; + + @Column(name = "BRIEF_TEXT") + @ApiParam("客户简称") + private String briefText; + + @Column(name = "ADDRESS") + @ApiParam("客户地址") + private String address; + + @Column(name = "CONTACT") + @ApiParam("客户联系人") + private String contact; + + @Column(name = "TELEPHONE") + @ApiParam("客户电话") + private String telephone; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java new file mode 100644 index 0000000..0c5f49c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes客户表 + * @Reference : + * @Author : yiming.gu + * @CreateDate : 2019-05-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER_PART") +@Api("客户零件关系") +public class MesCustomerPart extends BaseBean implements Serializable { + private static final long serialVersionUID = -4731252848471949263L; + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam("客户零件号") + private String customerPartNo; + + @Column(name = "CUSTOMER_PART_NAME") + @ApiParam("客户零件描述") + private String customerPartName; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java new file mode 100644 index 0000000..8bded7d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:12 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_OBJECT") +@Api("数据对象") +public class MesDataObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1419262751765770535L; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "DS_CODE") + @ApiParam("数据源代码") + private String dsCode; + + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java new file mode 100644 index 0000000..93ea185 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:17 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATASOURCE") +@Api("地址清单") +public class MesDatasource extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7387559860198655900L; + @Column(name = "DS_CODE") + @ApiParam("数据源代码") + private String dsCode; + + @Column(name = "DS_NAME") + @ApiParam("数据源名称") + private String dsName; + + @Column(name = "DS_TYPE") + @ApiParam("数据源类型") + private String dsType; + + @Column(name = "DS_HOST") + @ApiParam("主机") + private String dsHost; + + @Column(name = "DS_PORT") + @ApiParam("端口") + private Integer dsPort; + + @Column(name = "DS_USER") + @ApiParam("用户名") + private String dsUser; + + @Column(name = "DS_PASSWORD") + @ApiParam("密码") + private String dsPassword; + + @Column(name = "DS_DB_NAME") + @ApiParam("数据库名称") + private String dsDbName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Override + public String toString() { + return "MesDatasource{" + + "dsCode='" + dsCode + '\'' + + ", dsName='" + dsName + '\'' + + ", dsType='" + dsType + '\'' + + ", dsHost='" + dsHost + '\'' + + ", dsPort=" + dsPort + + ", dsUser='" + dsUser + '\'' + + ", dsPassword='" + dsPassword + '\'' + + ", dsDbName='" + dsDbName + '\'' + + ", equipmentCode='" + equipmentCode + '\'' + + '}'; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java new file mode 100644 index 0000000..c42d71d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -0,0 +1,81 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT") +@Api("缺陷表") +public class MesDefect extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6771813937279359333L; + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DEFECT_TYPE") + @ApiParam("缺陷类型") + private String defectType; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "DEFECT_FLAG_VALUE") + @ApiParam("缺陷标识值") + private String defectFlagValue; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + + @Transient + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @Transient + @ApiParam("缺陷位置") + private String defectLocation; + + @Transient + @ApiParam("缺陷类型子集") + private List mesDefectList; + + public MesDefect() { + + } + + public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) { + this.defectCode = defectCode; + this.defectName = defectName; + this.defectType = defectType; + this.defectTypeName = defectTypeName; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java new file mode 100644 index 0000000..d4f287f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_CAUSE") +@Api("缺陷原因表") +public class MesDefectCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3867250593038812861L; + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "DC_TYPE") + @ApiParam("缺陷原因类型") + private String dcType; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java new file mode 100644 index 0000000..a97ccef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 19:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("不良信息记录表") +public class MesDefectRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2828208776424343584L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置") + private String defectLocation; + + @Column(name = "SIDE_LOCATION") + @ApiParam("面位") + private String sideLocation; + + @Column(name = "REPAIR_STATUS") + @ApiParam("维修状态") + private Integer repairStatus; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Transient + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java new file mode 100644 index 0000000..14151ff --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; +import java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DISMANTLE_RECORD", indexes = { + @Index(columnList = "SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("物料拆解记录表") +public class MesDismantleRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7924346039878218038L; + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Double qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private BigDecimal okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private BigDecimal missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private BigDecimal scrapQty; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Transient + private String serialNumber; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java new file mode 100644 index 0000000..25fe6ee --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/23 18:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_ALARM_RECORD", indexes = { + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("设备自动报警记录表") +public class MesEquAlarmRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1675134362612851879L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警等级") + private Integer alarmLevel; + + @Column(name = "ALARM_START_TIME") + @ApiParam("报警开始时间") + private String alarmStartTime; + + @Column(name = "ALARM_STOP_TIME") + @ApiParam("报警开始时间") + private String alarmStopTime; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java new file mode 100644 index 0000000..df432f3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :生产设备 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQUIPMENT") +@Api("生产设备") +public class MesEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 7269069290035250108L; + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "STATUS") + @ApiParam("设备状态") + private Integer status; + + @Column(name = "EQUIPMENT_TYPE") + @ApiParam("设备类型") + private Integer equipmentType; + + @Column(name = "EQUIPMENT_CATEGORY") + @ApiParam("设备类别") + private String equipmentCategory; + + @Column(name = "EQUIPMENT_MODEL") + @ApiParam("型号") + private String equipmentModel; + + @Column(name = "EQUIPMENT_SPEC") + @ApiParam("规格") + private String equipmentSpec; + + @Column(name = "EQUIPMENT_MAKER") + @ApiParam("制造商") + private String equipmentMaker; + + @Column(name = "RELEASE_DATE") + @ApiParam("出厂日期") + private String releaseDate; + + @Column(name = "RECEIVE_DATE") + @ApiParam("接收日期") + private String receiveDate; + + @Column(name = "ENABLE_DATE") + @ApiParam("启用日期") + private String enableDate; + + @Column(name = "CONNECT_TYPE") + @ApiParam("连接类型") + private Integer connectType; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Transient + @ApiParam(value = "名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value = "父节点", access = "父节点", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java new file mode 100644 index 0000000..655c2f4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java @@ -0,0 +1,93 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ESOP") +@Api("作业指导书信息表(ODS)") +public class MesEsop extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4869646502033099294L; + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步序号") + private Integer stepSeq; + + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; + + @Transient + @ApiParam("文件名称") + private String fileName; + + @Transient + @ApiParam("文件URL") + private String fileUrl; + + @Transient + @ApiParam("组名") + private String groupName; + + @Transient + @ApiParam("文件原名") + private String fileOriginName; + + @Transient + @ApiParam("文件大小") + private String fileSize; + + @Transient + @ApiParam("文件类型名称") + private String fileType; + + @Transient + @ApiParam("同步标记") + private Integer syncTag = 0; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java new file mode 100644 index 0000000..cc17b50 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务事件 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EVENT") +@Api("系统业务事件") +public class MesEvent extends BaseBean implements Serializable { + private static final long serialVersionUID = -5604724665202938464L; + @Column(name = "EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name = "EVENT_NAME") + @ApiParam("事件名称") + private String eventName; + + @Column(name = "EVENT_TYPE") + @ApiParam("事件类型") + private Integer eventType; + + @Column(name = "BUTTON_CODE") + @ApiParam("按钮代码") + private String buttonCode; + + public int getEventTypeVal() { + return this.eventType == null ? 0 : this.eventType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java new file mode 100644 index 0000000..2a16eb0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务事件动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EVENT_ACTION") +@Api("系统业务事件动作") +public class MesEventAction extends BaseBean implements Serializable { + private static final long serialVersionUID = 3964084375279916831L; + @Column(name = "EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java new file mode 100644 index 0000000..f128453 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/10 8:37 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FI_CFG") +@Api("首检件配置") +public class MesFiCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1791614973371037158L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java new file mode 100644 index 0000000..a90ed92 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/4 1:28 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FILE") +@Api("文件表") +public class MesFile extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7017379708394714424L; + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "GROUP_NAME") + @ApiParam("组名") + private String groupName; + + @Column(name = "FILE_ORIGIN_NAME") + @ApiParam("文件原名") + private String fileOriginName; + + @Column(name = "FILE_SIZE") + @ApiParam("文件大小") + private String fileSize; + + @Column(name = "FILE_TYPE") + @ApiParam("文件类型名称") + private String fileType; + + @Column(name = "SYNC_TAG") + @ApiParam("同步标记") + private Integer syncTag = 0; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java new file mode 100644 index 0000000..243e6a9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :物料关键数据 + * @Reference : + * @Author : crish + * @CreateDate : 2019-05-15 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_KP_DATA") +@Api("生产区域") +public class MesKpData extends BaseBean implements Serializable { + private static final long serialVersionUID = -3332582267186642790L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name = "KEY_DATA_NAME") + @ApiParam("关键数据名称") + private String keyDataName; + + @Column(name = "KEY_DATA_COUNT") + @ApiParam("关键数据数量") + private Integer keyDataCount; + + @Column(name = "UPPER_LIMIT") + @ApiParam("数据上限") + private Double upperLimit; + + @Column(name = "LOWER_LIMIT") + @ApiParam("数据下限") + private Double lowerLimit; + + @Transient + @ApiParam("扭矩值") + private Double torqueValue; + + @Transient + @ApiParam("是否在范围之内") + private Boolean ok; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java new file mode 100644 index 0000000..9ca9ac7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java @@ -0,0 +1,95 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_KPSN_RULE") +@Api("关键件条码校验规则") +public class MesKpsnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = 8238308232531730720L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "LENGTH") + @ApiParam("长度") + private Integer length; + + @Column(name = "FROM1") + @ApiParam("起始1") + private Integer from1; + + @Column(name = "TO1") + @ApiParam("至1") + private Integer to1; + + @Column(name = "FIX1") + @ApiParam("内容1") + private String fix1; + + @Column(name = "FROM2") + @ApiParam("起始2") + private Integer from2; + + @Column(name = "TO2") + @ApiParam("至2") + private Integer to2; + + @Column(name = "FIX2") + @ApiParam("内容2") + private String fix2; + + @Column(name = "TYPE") + @ApiParam("类型") + private String type; + + @Column(name = "BIND_RULE") + @ApiParam("绑定规则") + private Integer bandRule; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + public int getLengthVal() { + return this.length == null ? 0 : this.length; + } + + public int getFrom1Val() { + return this.from1 == null ? 0 : this.from1; + } + + public int getTo1Val() { + return this.to1 == null ? 0 : this.to1; + } + + public int getFrom2Val() { + return this.from2 == null ? 0 : this.from2; + } + + public int getTo2Val() { + return this.to2 == null ? 0 : this.to2; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java new file mode 100644 index 0000000..589c237 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; +import java.util.List; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LABEL_TEMPLATE") +@Api(value = "打印模板", description = "打印模板") +public class MesLabelTemplate extends BaseBean implements Serializable { + + + private static final long serialVersionUID = 3797103812377146878L; + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") + private String templateCode; + + @Column(name = "TEMPLATE_NAME") + @ApiParam(value = "模板名称") + private String templateName; + + @Lob + @Column(name = "TEMPLATE_CONTENT") + @ApiParam(value = "模板内容") + private String templateContent; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value = "模板参数拼接") + @Transient + private String paramsPack; + + @Transient + @ApiParam(value = "模板id对应的模板参数") + private List labelTemplateParamList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java new file mode 100644 index 0000000..253f29a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.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 : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LABEL_TEMPLATE_PARAM") +@Api(value = "打印模板参数", description = "打印模板参数") +public class MesLabelTemplateParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3595706874099358555L; + @Column(name = "TEMPLATE_ID") + @ApiParam(value = "模板ID", access = "模板ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") + private String templateCode; + + @Column(name = "TEMPLATE_PARAM") + @ApiParam(value = "模板参数") + private String templateParam; + + @Lob + @Column(name = "TEMPLATE_PARAM_TEXT") + @ApiParam(value = "模板参数描述") + private String templateParamText; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value = "模板参数值") + @Transient + private String templateParamValue; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java new file mode 100644 index 0000000..e8daace --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务方法 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_METHOD") +@Api("系统业务方法") +public class MesMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -3629909409034083767L; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name = "METHOD_NAME") + @ApiParam("方法名称") + private String methodName; + + @Column(name = "CALL_CLASS") + @ApiParam("具体实现类") + private String callClass; + + /** + * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） + */ + @Column(name = "METHOD_TYPE") + @ApiParam("方法类型") + private Integer methodType; + + public int getMethodTypeVal() { + return this.methodType == null ? 0 : this.methodType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java new file mode 100644 index 0000000..3e81c47 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:11 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK") +@Api("监听任务") +public class MesMonitorTask extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8614480099840448294L; + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_OBJECT_TYPE") + @ApiParam("任务对象类型") + private Integer taskObjectType; + + @Column(name = "TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + + @Column(name = "TASK_EXCEPTION_DESC") + @ApiParam("异常描述") + private String taskExceptionDesc; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java new file mode 100644 index 0000000..891dc65 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:19 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK_DETAIL") +@Api("监听任务明细") +public class MesMonitorTaskDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4811270359386960747L; + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "DATA_OBJECT_NO") + @ApiParam("数据对象编号") + private String dataObjectNo; + +// @Column(name = "STORE_OBJECT_CODE") +// @ApiParam("存储对象代码") +// private String storeObjectCode; +// +// @Column(name = "STORE_FIELD_CODE") +// @ApiParam("存储字段代码") +// private String storeFieldCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java new file mode 100644 index 0000000..9fc51c2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/22 5:59 PM + * @Description: + **/ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_NUMBER_RULE") +@Api("条码生成规则") +public class MesNumberRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4039194855353751178L; + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; + + @Column(name = "RULE_DESC") + @ApiParam("规则描述") + private String ruleDesc; + + @Column(name = "PREFIX") + @ApiParam("前缀") + private String prefix; + + @Column(name = "NUMBER_RULE") + @ApiParam("编码规则") + private String numberRule; + + @Column(name = "SERIALNO_LENGTH") + @ApiParam("序号长度") + private Integer serialnoLength; + + @Column(name = "SERIALNO_INCREMENT") + @ApiParam("增量") + private Integer serialnoIncrement; + + @Column(name = "IS_CYCLE") + @ApiParam("最大值后循环") + private Integer isCycle; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java new file mode 100644 index 0000000..16436c6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Version; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 9:14 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_NUMBER_SERIALNO") +@Api("编码序号") +public class MesNumberSerialno extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3024166851634742872L; + @Column(name = "CURRENT_NUMBER_PREFIX") + @ApiParam("当前编号前缀") + private String currentNumberPrefix; + + @Column(name = "CURRENT_SERIALNO") + @ApiParam("当前序号") + private Integer currentSerialno; + + @Column(name = "CURRENT_NUMBER") + @ApiParam("当前编号") + private String currentNumber; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java new file mode 100644 index 0000000..5b7c166 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:14 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OBJECT_CFG") +@Api("对象结构") +public class MesObjectCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3640782210450491835L; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_TYPE") + @ApiParam("字段类型") + private String fieldType; + + @Column(name = "FIELD_LENGTH") + @ApiParam("列长度") + private Integer fieldLength; + + @Column(name = "POJO_ATTR") + @ApiParam("对应的pojo属性") + private String pojoAttr; + + @Column(name = "IS_SAVE") + @ApiParam("是否保存 1存 2不存") + private Integer isSave; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java new file mode 100644 index 0000000..38c0363 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :PLC设备信息配置表 + * @Reference : + * @Author : Crish + * @CreateDate : 2019-05-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLC_CONFIGURE") +@Api("PLC设备信息配置表") +@Deprecated +public class MesPLCConfigure extends BaseBean implements Serializable { + private static final long serialVersionUID = 8274445475806774L; + @Column(name = "IP") + @ApiParam("设备ip") + private String ipAddress; + + @Column(name = "CHANNEL_NAME") + @ApiParam("通道名称") + private String channelName; + + @Column(name = "DEVICE_NAME") + @ApiParam("设备地址") + private String deviceName; + + @Column(name = "TAG_NAME") + @ApiParam("标签地址") + private String tagName; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java new file mode 100644 index 0000000..7ca973d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java @@ -0,0 +1,99 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :包装规格 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACK_SPEC") +@Api("包装规格") +public class MesPackSpec extends BaseBean implements Serializable { + private static final long serialVersionUID = -788654193624068327L; + @Column(name = "SPEC_CODE") + @ApiParam("包装规格代码") + private String specCode; + + @Column(name = "SPEC_NAME") + @ApiParam("包装规格名称") + private String specName; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "包装数量", example = "0") + private Double qty; + + @Column(name = "QTY2") + @ColumnDefault("0") + @ApiParam(value = "包装数量2", example = "0") + private Double qty2; + + @Column(name = "QTY3") + @ColumnDefault("0") + @ApiParam(value = "包装数量3", example = "0") + private Double qty3; + + @Column(name = "QTY4") + @ColumnDefault("0") + @ApiParam(value = "包装数量4", example = "0") + private Double qty4; + + @Column(name = "IS_MIXED") + @ApiParam("是否混包") + private Integer isMixed; + + @Column(name = "IS_MIXED2") + @ApiParam("是否混包2") + private Integer isMixed2; + + @Column(name = "IS_MIXED3") + @ApiParam("是否混包3") + private Integer isMixed3; + + @Column(name = "IS_MIXED4") + @ApiParam("是否混包4") + private Integer isMixed4; + + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getIsMixedVal() { + return this.isMixed == null ? 0 : this.isMixed; + } + + public int getIsMixed2Val() { + return this.isMixed2 == null ? 0 : this.isMixed2; + } + + public int getIsMixed3Val() { + return this.isMixed3 == null ? 0 : this.isMixed3; + } + + public int getIsMixed4Val() { + return this.isMixed4 == null ? 0 : this.isMixed4; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java new file mode 100644 index 0000000..5eeff9e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -0,0 +1,119 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 1:26 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) +} +) +@Api("包装规格") +public class MesPackage extends BaseBean implements Serializable { + private static final long serialVersionUID = 2292859018089339608L; + @Column(name = "PACKAGE_NO", nullable = false) + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "PACK_SPEC_QTY") + @ApiParam("包装规格数量") + private Double packSpecQty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + + @Column(name = "PACK_SPEC") + @ApiParam("包装规格") + private String packSpec; + + @Column(name = "IS_SEALED") + @ApiParam("是否封箱") + private Integer isSealed; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态10：未打印 20：已打印") + private Integer printStatus; + + @Column(name = "PACK_LEVEL") + @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Transient + @ApiParam("封箱状态") + private String sealStatus; + + @Transient + @ApiParam("打印状态文字") + private String printStrStatus; + + @Transient + @ApiParam("打印缓存id") + private String printId; + + public MesPackage() { + } + + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { + this.packageNo = packageNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.packSpecQty = packSpecQty; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java new file mode 100644 index 0000000..a987364 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 2:55 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) +} +) +@Api("包装规格明细") +public class MesPackageDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8162606304720621672L; + @Column(name = "PACKAGE_NO", nullable = false) + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "SERIAL_NUMBER", nullable = false) + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编码2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编码3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编码4") + private String packageNo4; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java new file mode 100644 index 0000000..72084e3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 3:23 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Api("包装履历表") +public class MesPackageTravel extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2808747095415676213L; + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "OP_TYPE") + @ApiParam("操作类型") + private Integer opType; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编码2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编码3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编码4") + private String packageNo4; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java new file mode 100644 index 0000000..81365ef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -0,0 +1,93 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :物料信息 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART") +@Api("物料信息") +public class MesPart extends BaseBean implements Serializable { + private static final long serialVersionUID = 3936033255397936854L; + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("零件名称") + private String partName; + + @Column(name = "BRIEF_TEXT") + @ApiParam("零件简称") + private String briefText; + + @Column(name = "PART_SPEC") + @ApiParam("零件规格") + private String partSpec; + + @Column(name = "CATEGORY_CODE1") + @ApiParam("分类1") + private String categoryCode1; + + @Column(name = "CATEGORY_CODE2") + @ApiParam("分类2") + private String categoryCode2; + + @Column(name = "CATEGORY_CODE3") + @ApiParam("分类3") + private String categoryCode3; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "PACK_SPEC_CODE") + @ApiParam("包装规格代码") + private String packSpecCode; + + @Column(name = "DEFAULT_WORK_CENTER") + @ApiParam("默认工作中心") + private String defaultWorkCenter; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PROCESS_MATCH_TYPE") + @ApiParam("过程编码匹配类型") + private Integer processMatchType; + + @Column(name = "PACKAGE_MATCH_TYPE") + @ApiParam("包装编码匹配类型") + private Integer packageMatchType; + + @Column(name = "PRODUCT_MATCH_TYPE") + @ApiParam("产品编码匹配类型") + private Integer productMatchType; + + @Transient + @ApiParam("分类名称") + private String categoryName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java new file mode 100644 index 0000000..949a02f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :零件种类 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_CATEGORY") +@Api("零件种类") +public class MesPartCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = 9076081904146489470L; + @Column(name = "CATEGORY_CODE") + @ApiParam("分类代码") + private String categoryCode; + + @Column(name = "CATEGORY_NAME") + @ApiParam("分类名称") + private String categoryName; + + @Column(name = "CATEGORY_TYPE") + @ApiParam("分类类型") + private String categoryType; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java new file mode 100644 index 0000000..94f495f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 15:50 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_FORMULA") +@Api("MES_物料配方") +public class MesPartFormula extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3120650997069271308L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + + @Column(name = "FORMULA_TYPE") + @ApiParam("配方类型") + private Integer formulaType; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java new file mode 100644 index 0000000..9c8adca --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :JIS发运模式 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PATTERN_JIS") +@Api("JIS发运模式") +public class MesPatternJis extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1119289554542499312L; + @Column(name = "PATTERN_NO") + @ApiParam("模式编号") + private String patternNo; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式名称") + private String patternName; + + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; + + @Column(name = "PATTERN_DESC") + @ApiParam("描述") + private String patternDesc; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; + + @Column(name = "PATTERN_TYPE") + @ApiParam("模式类型") + private Integer patternType; + + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java new file mode 100644 index 0000000..c19bfa3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN") +@Api("PCN节点") +public class MesPcn extends BaseBean implements Serializable { + private static final long serialVersionUID = -7570827672640277097L; + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "PCN_NAME") + @ApiParam("PCN名称") + private String pcnName; + + @Column(name = "AREA_CODE") + @ApiParam("区域") + private String areaCode; + + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name = "CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name = "CONNECT_COUNT") + @ApiParam("连接次数") + private Integer connectCount; + + @Column(name = "IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name = "CONNECT_TIME") + @ApiParam("连接时间") + private String connectTime; + + @Column(name = "CODE_SPECIFIC") + @ApiParam("PCN特殊字段") + private String codeSpecific; + + public int getConnectCountVal() { + return this.connectCount == null ? 0 : this.connectCount; + } + + public int getIsConnectVal() { + return this.isConnect == null ? 0 : this.isConnect; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java new file mode 100644 index 0000000..faa7f92 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_CONNECT_LOG") +@Api("PCN节点连接日志") +public class MesPcnConnectLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -4153357131289178766L; + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "PCN_NAME") + @ApiParam("PCN名称") + private String pcnName; + + @Column(name = "PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name = "CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name = "IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name = "REMARK") + @ApiParam("备注") + private String Remark; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java new file mode 100644 index 0000000..4d321f8 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:32 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_SYNC_CFG") +@Api("MES_PCN_同步配置") +public class MesPcnSyncCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -6869288362923390521L; + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "OBJECT_KEY") + @ApiParam("对象主键") + private String objectKey; + + @Column(name = "SYNC_FREQUENCY") + @ApiParam("同步频率") + private Integer syncFrequency; + + @Column(name = "SYNC_TIME") + @ApiParam(value = "同步时间") + private String syncTime; + + @Column(name = "SYNC_PATTERN") + @ApiParam("同步方式 2.新增 1.修改") + private Integer syncPattern; + + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes") + private Integer syncType; + + @Column(name = "LAST_SYNC_TIME") + @ApiParam(value = "上一同步时间") + private String lastSyncTime; + + @Column(name = "EXTRACT_GAP") + @ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制") + private Integer extractGap; + + @Column(name = "EXTRACT_CONDITION") + @ApiParam(value = "从数据库抽取的条件限制") + private String extractCondition; + + @Column(name = "IS_IGNORE_ORG") + @ApiParam(value = "同步的时候是否区分工厂") + private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + public int getSyncFrequencyVal() { + return this.syncFrequency == null ? 0 : this.syncFrequency; + } + + public int getSyncTypeVal() { + return this.syncType == null ? 0 : this.syncType; + } + + public int getSyncPatternVal() { + return this.syncPattern == null ? 0 : this.syncPattern; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java new file mode 100644 index 0000000..22810be --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_SYNC_ERRORLOG") +@Api("MES_PCN同步异常日志") +public class MesPcnSyncErrorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -2249754641660006488L; + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "ERROR_SPOT") + @ApiParam("异常位置") + private String errorSpot; + + @Lob + @Column(name = "ERROR_CONTENT") + @ApiParam("异常内容") + private String errorContent; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java new file mode 100644 index 0000000..fc4f33b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.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; +import java.util.List; + +/** + * @Description : 账号离线登陆表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-01 11:02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_SYS_USER_OFFLINE") +@Api(value = "账号离线登陆表", description = "账号离线登陆表。") +public class MesPcnSysUserOffline extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7617353154826718154L; + @Column(name = "USER_ID") + @ApiParam(value = "人员ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号", access = "用户编号") + private String userCode; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名称", access = "账号名称") + private String userName; + + @Column(name = "LOGIN_NAME") + @ApiParam(value = "登陆名称", access = "登陆名称") + private String loginName; + + @Column(name = "USER_TYPE") + @ApiParam(value = "账号类型（枚举，待定）", example = "-1") + private Integer userType; + + @Lob + @Column(name = "LOGIN_INFO") + @ApiParam(value = "登陆信息", access = "登陆信息") + private String loginInfo; + + @Lob + @Column(name = "MENU_LIST") + @ApiParam(value = "菜单", access = "菜单") + private String menuList; + + @Lob + @Column(name = "MODULE_LIST") + @ApiParam(value = "模块", access = "模块") + private String moduleList; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java new file mode 100644 index 0000000..8288401 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_TASK") +@Api("mes-pcn定时任务工作清单") +public class MesPcnTask extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4777357978430670966L; + @Column(name = "TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_GROUP_NAME") + @ApiParam("任务组名称") + private String taskGroupName; + + @Column(name = "TASK_DESCRIPTION") + @ApiParam("任务描述") + private String taskDescription; + + @Column(name = "TASK_TYPE") + @ApiParam("任务类型") + private Integer taskType; + + @Column(name = "TASK_MODULE") + @ApiParam("任务模块") + private String taskModule; + + @Column(name = "TASK_CLASS") + @ApiParam("任务类名") + private String taskClass; + + @Column(name = "TASK_PACKAGE") + @ApiParam("任务包名") + private String taskPackage; + + @Column(name = "PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name = "PCN_CODE") + @ApiParam("PCN节点名称代码") + private String pcnCode; + + @Column(name = "TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name = "TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + @Column(name = "TASK_PARAM") + @ApiParam("任务参数") + private String taskParam; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java new file mode 100644 index 0000000..f0ee69f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes-pcn定时任务工作清单同步记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_TASK_LOG") +@Api("mes-pcn定时任务工作清单同步记录") +public class MesPcnTaskLog extends BaseBean implements Serializable { + + private static final long serialVersionUID = -784806389462540310L; + @Column(name = "SYNC_TIME_START") + @ApiParam("同步数据开始时间") + private String syncTimeStart; + + @Column(name = "SYNC_TIME_END") + @ApiParam("同步数据截止时间") + private String syncTimeEnd; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_CONTENT") + @ApiParam("异常内容") + private Long errorContent; + + public int getSyncStatusVal() { + return this.syncStatus == null ? 0 : this.syncStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java new file mode 100644 index 0000000..bfd78e2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -0,0 +1,144 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +} +) +@Api("生产主计划") +public class MesPlanOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 8571104279843276872L; + @Column(name = "ORDER_NO", nullable = false) + @ApiParam("生产计划单号") + private String orderNo; + + @Column(name = "PO_TYPE") + @ApiParam("计划类型") + private Integer planType; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "PLAN_QTY") + @ApiParam("计划数量") + private Double planQty; + + @Column(name = "DECOMPOSE_QTY") + @ApiParam("分解数量") + private Double decomposeQty; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam("计划开始时间") + private String startTime; + + @Column(name = "END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam("计划结束时间") + private String endTime; + + @Column(name = "DELIVERY_DATE") + @ApiParam("交货日期") + private String deliveryDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name = "SOURCE") + @ApiParam("计划来源") + private String source; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + /********************** 冗余字段 *********************************/ + + @Transient + @ApiParam(value = "区域") + public String areaCode; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + public String startTimeEnd; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + public String endTimeEnd; + + public double getPlanQtyVal() { + return this.planQty == null ? 0.0d : this.planQty; + } + + public double getDecomposeQtyVal() { + return this.decomposeQty == null ? 0.0d : this.decomposeQty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public int getPlanTypeVal() { + return this.planType == null ? 0 : this.planType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java new file mode 100644 index 0000000..5d5a48c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/25 8:07 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLC") +@Api("PLC配置表") +public class MesPlc extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5346536604317095818L; + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "PLC_MODEL") + @ApiParam("PLC型号") + private String plcModel; + + @Column(name = "PLC_IP") + @ApiParam("PLC IP") + private String plcIp; + + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "TAG_NAME") + @ApiParam("标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam("标签地址") + private String tagAddress; + + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + + @Column(name = "GROUP_NAME") + @ApiParam("分组名称") + private String groupName; + + @Column(name = "DEVICE") + @ApiParam("驱动") + private String device; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "PLC_CFG") + @ApiParam("PLC的值的设定") + private String plcCfg; + + @Column(name = "ANALYSIS_RULE") + @ApiParam("解析规则") + private String analysisRule; + + @Column(name = "IS_ANALYSIS") + @ApiParam("是否解析") + private String isAnalysis; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Transient + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java new file mode 100644 index 0000000..752400b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工序 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROCESS") +@Api("工序") +public class MesProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = -2619648674238082872L; + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "PROCESS_NAME") + @ApiParam("工序名称") + private String processName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java new file mode 100644 index 0000000..8114387 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -0,0 +1,106 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :产品绑定记录表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_BIND_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "KP_SN") +}) +@Api("产品绑定记录表") +public class MesProdBindRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -4319604821328717354L; + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品条码零件号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元") + private String workCellCode; + + @Column(name = "STEP_CODE") + @ApiParam(value = "工步代码") + private String stepCode; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料零件号") + private String itemPartNo; + + @Column(name = "KP_SN") + @ApiParam("原材料条码") + private String kpSn; + + @Column(name = "KP_QTY") + @ColumnDefault("0") + @ApiParam(value = "原材料数量", example = "0") + private Double kpQty; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商") + private String supplierCode; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "IS_FEED") + @ApiParam("是否投料配置") + private Integer isFeed; + + @Column(name = "VERSION") + @ApiParam("版本") + private String version; + + @Column(name = "RESULT") + @ApiParam(value = "结果") + private String result; + + @Column(name = "is_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + + @Column(name = "ACTION_TYPE") + @ApiParam(value = "动作类型") + private Integer actionType; + + public int getIsFeedVal() { + return this.isFeed == null ? 0 : this.isFeed; + } + + public double getQtyVal() { + return this.kpQty == null ? 0.0d : this.kpQty; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java new file mode 100644 index 0000000..4ff20da --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :产品配置 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_CFG") +@Api("产品配置") +public class MesProdCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 7487874316722319947L; + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME") + @ApiParam("产品配置名称") + private String prodCfgName; + + @Column(name = "PROD_CFG_Type_CODE") + @ApiParam("产品配置类型代码") + private String prodCfgTypeCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java new file mode 100644 index 0000000..fd4cf72 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :产品配置明细 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_CFG_DETAIL") +@Api("产品配置明细") +public class MesProdCfgDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -8362302529703401583L; + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "IS_VIRTUAL") + @ApiParam("是否虚零件") + private Integer isVirtual; + + @Transient + @ApiParam("零件名称") + private String partName; + + public int getIsVirtualVal() { + return this.isVirtual == null ? 0 : this.isVirtual; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java new file mode 100644 index 0000000..a68bcec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 3:25 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_PACK") +@Api("产品包装关系") +public class MesProdPack extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2621135811864108025L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "PACK_SPEC") + @ApiParam("包装规格") + private String packSpec; + + @Column(name = "PROD_LABEL_TEMPLATE") + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Column(name = "PACK_LABEL_TEMPLATE") + @ApiParam("包装标签模板") + private String packLabelTemplate; + + @Column(name = "PACK_LABEL_TEMPLATE2") + @ApiParam("包装标签模板2") + private String packLabelTemplate2; + + @Column(name = "PACK_LABEL_TEMPLATE3") + @ApiParam("包装标签模板3") + private String packLabelTemplate3; + + @Column(name = "PACK_LABEL_TEMPLATE4") + @ApiParam("包装标签模板4") + private String packLabelTemplate4; + + @Column(name = "PROD_CFG_TYPE") + @ApiParam("项目") + private String prodCfgType; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java new file mode 100644 index 0000000..4e8c76d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :产品类流程配置表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_ROUTE_CFG") +@Api("产品类流程配置表") +public class MesProdRouteCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -3768632071281056796L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java new file mode 100644 index 0000000..169af24 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :产品流程配置操作参数表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_ROUTE_OPT_PARAM") +@Api("产品流程配置操作参数表") +public class MesProdRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -932364659894292000L; + @Column(name = "PROD_ROUTE_CFG_ID") + @ApiParam("产品流程ID") + private Long prodRouteCfgId; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name = "PARAM_CODE") + @ApiParam("工步参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("工步参数值") + private String paramValue; + + public long getProdRouteCfgIdVal() { + return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId; + } + + public int getStepSeq() { + return this.stepSeq == null ? 0 : this.stepSeq; + } + + public void setStepSeq(int stepSeq) { + this.stepSeq = stepSeq; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java new file mode 100644 index 0000000..f6e32ce --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description :散件产品配置明细 + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 17:52 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_SCATTER_CFG_BOM") +@Api("散件产品配置明细") +public class MesProdScatterCfgBom extends BaseBean implements Serializable { + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "QTY") + @ApiParam("用量") + private BigDecimal qty; + + @Column(name = "IS_KEY_PART") + @ApiParam("是否关键件") + private Integer isKeyPart; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java new file mode 100644 index 0000000..5520632 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CATEGORY") +@Api("系统业务动作") +public class MesProduceCategory extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4593983703007675620L; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CTGY_NAME") + @ApiParam("产品类型名称") + private String produceCategoryName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java new file mode 100644 index 0000000..aeda2b0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CTGY_PICTURE") +@Api("产品类型图片表") +public class MesProduceCtgyPicture extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7223382567320219332L; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCtgyCode; + + @Column(name = "SIDE_LOCATION") + @ApiParam("面位") + private String sideLocation; + + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; + + @Transient + @ApiParam("文件名称") + private String fileName; + + @Transient + @ApiParam("文件URL") + private String fileUrl; + + @ApiParam("图片URL") + private String pictureUrl; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java new file mode 100644 index 0000000..6262a8a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -0,0 +1,205 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) +} +) +@Api("产品条码表") +public class MesProduceSn extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6641051790330191326L; + + @Column(name = "SERIAL_NUMBER", nullable = false) + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name = "SN_STATUS") + @ApiParam("条码状态") + private Integer snStatus; + + @Column(name = "PRINT_COUNT") + @ApiParam("打印次数") + private Integer printCount; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "NEXT_PROCESS_CODE") + @ApiParam("下一工序代码") + private String nextProcessCode; + + @Column(name = "IN_WC_TIME") + @ApiParam("进产线时间") + private String inWorkCenterTime; + + @Column(name = "OUT_WC_TIME") + @ApiParam("出产线时间") + private String outWorkCenterTime; + + @Column(name = "SHIPPING_TIME") + @ApiParam("发运时间") + private String shippingTime; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "CUST_SN") + @ApiParam("客户条码") + private String custSn; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "SN_TYPE") + @ApiParam("条码类型 10=正常 20=首检件") + private Integer snType; + + @Column(name = "TRAY_NO") + @ApiParam("托盘号") + private String trayNo; +// +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public transient Integer lockVersion; + + @Transient + @ApiParam("返回信息") + private String resultMsg; + + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + + @Transient + @ApiParam("下线时间开始") + private String outWorkCenterTimeStart; + + @Transient + @ApiParam("下线时间截止") + private String outWorkCenterTimeEnd; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getQcStatusVal() { + return this.qcStatus == null ? 0 : this.qcStatus; + } + + public int getSnStatusVal() { + return this.snStatus == null ? 0 : this.snStatus; + } + + public int getPrintCountVal() { + return this.printCount == null ? 0 : this.printCount; + } + + public int getPrintStatusVal() { + return this.printStatus == null ? 0 : this.printStatus; + } + + public int getSnTypeVal() { + return this.snType == null ? 0 : this.snType; + } + + @Override + public String toString() { + return "MesProduceSn{" + + "serialNumber='" + serialNumber + '\'' + + ", partNo='" + partNo + '\'' + + ", partNameRdd='" + partNameRdd + '\'' + + ", qty=" + qty + + ", qcStatus=" + qcStatus + + ", snStatus=" + snStatus + + ", printCount=" + printCount + + ", printStatus=" + printStatus + + ", workCenterCode='" + workCenterCode + '\'' + + ", workCellCode='" + workCellCode + '\'' + + ", routeCode='" + routeCode + '\'' + + ", processCode='" + processCode + '\'' + + ", nextProcessCode='" + nextProcessCode + '\'' + + ", inWorkCenterTime='" + inWorkCenterTime + '\'' + + ", outWorkCenterTime='" + outWorkCenterTime + '\'' + + ", shippingTime='" + shippingTime + '\'' + + ", workOrderNo='" + workOrderNo + '\'' + + ", custSn='" + custSn + '\'' + + ", custPartNo='" + custPartNo + '\'' + + ", snType=" + snType + + ", trayNo='" + trayNo + '\'' + + ", resultMsg='" + resultMsg + '\'' + + ", operateType=" + operateType + + ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + + ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' + + '}'; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java new file mode 100644 index 0000000..5d8ce41 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -0,0 +1,154 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : dragon.xu + * @CreateDate : 2019-05-29 16:22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME") +}) +@Api("产品条码履历表") +public class MesProduceSnTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -1692487592284871549L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name = "SN_STATUS") + @ApiParam("条码状态") + private Integer snStatus; + + @Column(name = "PRINT_COUNT") + @ApiParam("打印次数") + private Integer printCount; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "NEXT_PROCESS_CODE") + @ApiParam("下一工序代码") + private String nextProcessCode; + + @Column(name = "IN_WC_TIME") + @ApiParam("进产线时间") + private String inWorkCenterTime; + + @Column(name = "OUT_WC_TIME") + @ApiParam("出产线时间") + private String outWorkCenterTime; + + @Column(name = "SHIPPING_TIME") + @ApiParam("发运时间") + private String shippingTime; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "CUST_SN") + @ApiParam("客户条码") + private String custSn; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name = "SN_TYPE") + @ApiParam("条码类型 10=正常（默认），20=首检件") + private Integer snType; + + @Column(name = "TRAY_NO") + @ApiParam("托盘号") + private String trayNo; + + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + + @Transient + @ApiParam("返回信息") + private String resultMsg; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getQcStatusVal() { + return this.qcStatus == null ? 0 : this.qcStatus; + } + + public int getSnStatusVal() { + return this.snStatus == null ? 0 : this.snStatus; + } + + public int getPrintCountVal() { + return this.printCount == null ? 0 : this.printCount; + } + + public int getPrintStatusVal() { + return this.printStatus == null ? 0 : this.printStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java new file mode 100644 index 0000000..600bfc2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -0,0 +1,109 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : Wynne.Lu + * @CreateDate : 2019-10-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_DATA", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "OBJECT_CODE"), + @Index(columnList = "MODIFY_DATE_TIME") +}) +@Api("生产数据") +public class MesProductData extends BaseBean implements Serializable { + private static final long serialVersionUID = -2365404168777050771L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_DESC") + @ApiParam("物料名称") + private String partDesc; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_VALUE") + @ApiParam("字段值") + private String fieldValue; + + @Column(name = "ROW_NO") + @ApiParam("数据行号") + private String rowNo; + + @Column(name = "GROUP_NO") + @ApiParam("数据组号") + private String groupNo; + + @Lob + @Column(name = "LINE_DATA") + @ApiParam("生产数据") + private String lineData; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java new file mode 100644 index 0000000..b1b3d8c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_ENCODE_CFG") +@Api("产品编码配置表") +public class MesProductEncodeCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6641051790330191326L; + + @Column(name = "CODE_TYPE") + @ApiParam("编码类型") + private Integer codeType; + + @Column(name = "MATCH_TYPE") + @ApiParam("匹配类型") + private Integer matchType; + + @Column(name = "MATCH_VALUE") + @ApiParam("匹配值") + private String matchValue; + + @Column(name = "RULE_CODE") + @ApiParam("编码规则代码") + private String ruleCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java new file mode 100644 index 0000000..b5b9fa2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -0,0 +1,107 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 16:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_CHECK_DATA", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "SN") +}) +@Api("质量过程检测数据") +public class MesQcCheckData extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3600528549583720850L; + @Column(name = "CHECK_ID") + @ApiParam("检测id") + private String checkId; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + + @Column(name = "CHECK_RESULT") + @ApiParam("判定结果") + private String checkResult; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Integer qty; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + + @Transient + @ApiParam("过程质量检测数据") + private List mesQcCheckStandardList; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java new file mode 100644 index 0000000..be9bfe8 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -0,0 +1,108 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 14:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_CHECK_STANDARD") +@Api("质量检测标准") +public class MesQcCheckStandard extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1590320231495124712L; + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("检测结果") + private String checkResult; + + @Transient + @ApiParam("检测值") + private String checkValue; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @Transient + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + @Transient + private List childQcList; + + public MesQcCheckStandard() { + } + + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { + this.id = id; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.partName = partName; + this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java new file mode 100644 index 0000000..7d4bd81 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :JIS发运队列 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS") +@Api("JIS发运队列") +public class MesQueueJis extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8028683333028906395L; + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CAR_NO") + @ApiParam("车号") + private String carNo; + + @Column(name = "SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Transient + @ApiParam("颜色") + private String color; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java new file mode 100644 index 0000000..ef3b7d1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :JIS发运队列明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS_DETAIL") +@Api("JIS发运队列明细") +public class MesQueueJisDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 829273008952400763L; + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "FINAL_STATUS") + @ApiParam("明细整体状态") + private Integer finalStatus; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java new file mode 100644 index 0000000..ea2e7e7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_ORDER", indexes = { + @Index(columnList = "CUST_FLAG_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +} +) +@Api("生产队列主表") +public class MesQueueOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 6538031118299400711L; + @Column(name = "ORDER_NO", nullable = false) + @ApiParam("主队列编号") + private String orderNo; + + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME_RDD") + @ApiParam("产品配置名称") + private String prodCfgNameRdd; + + @Column(name = "SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Transient + @ApiParam("起始车号") + private String custFlagNoStart; + + @Transient + @ApiParam("截至车号") + private String custFlagNoEnd; + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java new file mode 100644 index 0000000..61d8c82 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { + @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +} +) +@Api("生产队列明细") +public class MesQueueOrderDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 1548933241804083457L; + @Column(name = "ORDER_NO", nullable = false) + @ApiParam("主队列编号") + private String orderNo; + + @Column(name = "PART_NO", nullable = false) + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "SEQ") + @ApiParam("队列明细序号") + private Double seq; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "WORK_TYPE") + @ApiParam("生产类型") + private String workType; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CATEGORY_NAME_RDD") + @ApiParam("产品类型名称") + private String produceCategoryNameRdd; + + @Transient + @ApiParam("队列序号") + private Double queueSeq; + + public double getQueueSeqVal() { + return this.queueSeq == null ? 0.0d : this.queueSeq; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public MesQueueOrderDetail() { + } + + public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) { + this.queueSeq = queueSeq; + this.seq = seq; + this.serialNumber = serialNumber; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java new file mode 100644 index 0000000..3f3458c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) +@Api("原材料信息") +public class MesRawPartSn extends BaseBean implements Serializable { + private static final long serialVersionUID = 5504323561257182116L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("数量") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "STATUS") + @ApiParam("原料状态") + private Integer status; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java new file mode 100644 index 0000000..785f350 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :维修 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-08 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_REPAIR") +@Api("维修") +public class MesRepair extends BaseBean implements Serializable { + private static final long serialVersionUID = -7520365696308295804L; + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + + @Column(name = "REPAIR_TYPE") + @ApiParam("维修类型") + private Integer repairType; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java new file mode 100644 index 0000000..e6da731 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_REPAIR_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("维修信息记录表") +public class MesRepairRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2453726410779076150L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "SIDE_LOCATION") + @ApiParam("产品面位") + private String sideLocation; + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置") + private String defectLocation; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因描述") + private String dcName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Transient + @ApiParam("备注") + private String spareMemo; + + @Transient + @ApiParam("不良记录id") + private Long defectRecordId; + + @Transient + @ApiParam("缺陷集合") + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java new file mode 100644 index 0000000..f8b2802 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :流程表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE") +@Api("流程表") +public class MesRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = -7622507229961050740L; + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_NAME") + @ApiParam("流程名称") + private String routeName; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS位置") + private String position; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java new file mode 100644 index 0000000..556d26f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :流程工序关系 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE_PROCESS") +@Api("流程工序关系") +public class MesRouteProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = 3477334942090180010L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "NEXT_PROCESS") + @ApiParam("下一工序") + private String nextProcess; + + @Column(name = "REPAIR_PROCESS") + @ApiParam("维修工序") + private String repairProcess; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Column(name = "IS_NECESSARY") + @ApiParam("是否必须") + private Integer isNecessary; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + public int getIsNecessaryVal() { + return this.isNecessary == null ? 0 : this.isNecessary; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java new file mode 100644 index 0000000..5907cec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工序工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE_PROCESS_CELL") +@Api("工序工作单元对照") +public class MesRouteProcessCell extends BaseBean implements Serializable { + private static final long serialVersionUID = -703779336699805482L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java new file mode 100644 index 0000000..a77b075 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :报废原因 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-08 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRAP") +@Api("报废原因") +public class MesScrap extends BaseBean implements Serializable { + private static final long serialVersionUID = -6202113707752178624L; + @Column(name = "SCRAP_CODE") + @ApiParam("报废代码") + private String scrapCode; + + @Column(name = "SCRAP_NAME") + @ApiParam("报废名称") + private String scrapName; + + @Column(name = "SCRAP_TYPE") + @ApiParam("报废类型") + private String scrapType; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java new file mode 100644 index 0000000..97ac5d3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRAP_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("报废信息记录表") +public class MesScrapRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8519832449647086195L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "SCRAP_CODE") + @ApiParam("报废代码") + private String scrapCode; + + @Column(name = "SCRAP_NAME") + @ApiParam("报废名称") + private String scrapName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java new file mode 100644 index 0000000..df66c61 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : crish + * @CreateDate : 2019-04-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT") +@Api("班次信息") +public class MesShift extends BaseBean implements Serializable { + private static final long serialVersionUID = -1174268061355263705L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; + + @Column(name = "START_TIME") + @ApiParam("开班时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("下班时间") + private String endTime; + + @Column(name = "WORK_TIMES") + @ApiParam("作业时长") + private Double workTimes; + + @Column(name = "SHIFT_SEQ") + @ApiParam("班次顺序") + private Integer shiftSeq; + + public int getShiftSeqVal() { + return this.shiftSeq == null ? 0 : this.shiftSeq; + } + + public double getWorkTimesVal() { + return this.workTimes == null ? 0.0d : this.workTimes; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java new file mode 100644 index 0000000..7aac2d7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT_GROUP") +@Api("班组") +public class MesShiftGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 8962836866086379111L; + @Column(name = "GROUP_CODE") + @ApiParam("班组代码") + private String groupCode; + + @Column(name = "GROUP_NAME") + @ApiParam("班组名称") + private String groupName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SQUAD_LEADER") + @ApiParam("班长") + private String squadLeader; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java new file mode 100644 index 0000000..a7c1232 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : yiming.gu + * @CreateDate : 2019-05-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT_REST") +@Api("班次休息信息") +public class MesShiftRest extends BaseBean implements Serializable { + private static final long serialVersionUID = -8712815093203320523L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name = "REST_TIMES") + @ApiParam("休息时长") + private Double restTimes; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java new file mode 100644 index 0000000..b29fae0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/18 0018 - 9:07 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SN_PHOTO_RELATION") +@Api("条码照片关系") +public class MesSnPhotoRelation extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7732648131003455681L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("条码") + private String serialNumber; + + @Column(name = "PHOTO_PATH") + @ApiParam("照片路径") + private String photoPath; + + @Column(name = "PHOTO_NAME") + @ApiParam("照片名称") + private String photoName; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java new file mode 100644 index 0000000..b376b32 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java @@ -0,0 +1,151 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; +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.Transient; +import java.io.Serializable; + +/** + * @Description :工序物料清单 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATION_BOM") +@Api("工序物料清单") +public class MesStationBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -4693067673094931011L; + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子零件") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("原材料物料名称") + private String itemPartName; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "子零件数量", example = "0") + private Double qty; + + @Column(name = "IS_REPEAT") + @ApiParam(value = "是否可重复") + private Integer isRepeat; + + @Column(name = "IS_CHECK") + @ApiParam(value = "是否检查") + private Integer isCheck; + + @Column(name = "IS_FEED") + @ApiParam(value = "是否投料配置") + private Integer isFeed; + + @Column(name = "IS_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + + @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; + + @Transient + @ApiParam("是否已绑定") + private Boolean isBind; + + @Transient + @ApiParam("显示颜色") + private String color; + + @Transient + @ApiParam("关键件代码") + private String keyBarCode; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + + public double getBoundQtyVal() { + return this.boundQty == null ? 0.0d : this.boundQty; + } + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getIsRepeatVal() { + return this.isRepeat == null ? 0 : this.isRepeat; + } + + public int getIsCheckVal() { + return this.isCheck == null ? 0 : this.isCheck; + } + + public boolean getIsBindVal() { + return this.isBind == null ? false : this.isBind; + } + + public int getIsFeedVal() { + return this.isFeed == null ? 0 : this.isFeed; + } + + @Override + public String toString() { + return "MesStationBom{" + + "partNo='" + partNo + '\'' + + ", itemPartNo='" + itemPartNo + '\'' + + ", qty=" + qty + + ", isRepeat=" + isRepeat + + ", isCheck=" + isCheck + + ", isFeed=" + isFeed + + ", isBind=" + isBind + + ", color='" + color + '\'' + + ", id=" + id + + ", organizeCode='" + organizeCode + '\'' + + ", isValid=" + isValid + + ", isDeleted=" + isDeleted + + ", createUser='" + createUser + '\'' + + ", createDatetime='" + createDatetime + '\'' + + ", modifyUser='" + modifyUser + '\'' + + ", modifyDatetime='" + modifyDatetime + '\'' + + ", createDateTimeStart='" + createDateTimeStart + '\'' + + ", createDateTimeEnd='" + createDateTimeEnd + '\'' + + ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' + + ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' + + ", orderByParam='" + orderByParam + '\'' + + ", ascOrDesc=" + ascOrDesc + + '}'; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java new file mode 100644 index 0000000..0998015 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :工步 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STEP") +@Api("工步") +public class MesStep extends BaseBean implements Serializable { + private static final long serialVersionUID = -2157306767211269786L; + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_NAME") + @ApiParam("工步名称") + private String stepName; + + @Column(name = "STEP_TEXT") + @ApiParam("工步描述") + private String stepText; + + @Column(name = "STEP_TYPE") + @ApiParam("工步类型") + private String stepType; + + @Column(name = "STEP_OBJECT") + @ApiParam("工步对象") + private String stepObject; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("流程代码") + private String routeCode; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工序代码") + private String processCode; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工步顺序") + private Integer stepSeq; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工步执行完毕") + private boolean isComplete; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工步是否跳过") + private boolean isJump; + + public MesStep() { + } + + public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject, + String routeCode, String processCode, Integer stepSeq) { + this.stepCode = stepCode; + this.stepName = stepName; + this.stepText = stepText; + this.stepType = stepType; + this.stepObject = stepObject; + this.routeCode = routeCode; + this.processCode = processCode; + this.stepSeq = stepSeq; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java new file mode 100644 index 0000000..dd5a834 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工步参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STEP_PARAM") +@Api("工步参数") +public class MesStepParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -147541368320233093L; + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_ATTRIBUTE") + @ApiParam("参数属性") + private String paramAttribute; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java new file mode 100644 index 0000000..0d30d54 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TIME") +@Api("工步参数") +public class MesTime extends BaseBean implements Serializable { + private static final long serialVersionUID = 1562011791394529076L; + + @Column(name = "MODULE") + @ApiParam("组件") + private String module; + + @Column(name = "ELAPSE") + @ApiParam("耗时") + private Long elapse; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java new file mode 100644 index 0000000..b6071b9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :扭矩信息记录表 + * @Reference : + * @Author : Crish + * @CreateDate : 2019-05-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TORQUE_DETAIL") +@Api("扭矩信息记录表") +public class MesTorqueDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 2900363253333046861L; + + @Column(name = "SN") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "UPPER_LIMIT") + @ApiParam("最大值") + private Double upperLimit; + + @Column(name = "LOWER_LIMIT") + @ApiParam("最小值") + private Double lowerLimit; + + @Column(name = "TORQUE_DETAIL_VALUE") + @ApiParam("扭矩值") + private Double torqueValue; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "ok") + @ApiParam("扭矩是否合格") + private String ok; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "p_set") + @ApiParam("螺丝枪PSET设置值") + private String deviceSetValue; + + @Column(name = "MAXANGLE") + @ApiParam("最大扭矩") + private String maxAngle; + + @Column(name = "MINANGLE") + @ApiParam("最小扭矩") + private String minAngel; + + @Column(name = "FINALANGLE") + @ApiParam("最终扭矩") + private Integer finalAngle; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name = "KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name = "RESULT_MSG") + @ApiParam("扭矩判定结果") + private String resultMsg; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java new file mode 100644 index 0000000..506ed2a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\22 16:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TYPE_CFG") +@Api("类型信息表") +public class MesTypeCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -1699612238800419597L; + + @Column(name = "TYPE_CODE") + @ApiParam("类型代码") + private String typeCode; + + @Column(name = "TYPE_NAME") + @ApiParam("类型名称") + private String typeName; + + @Column(name = "BUSINESS_TYPE_CODE") + @ApiParam("业务类型代码") + private String businessTypeCode; + + @Column(name = "BUSINESS_TYPE_NAME") + @ApiParam("业务类型名称") + private String businessTypeName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java new file mode 100644 index 0000000..a089f0a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_CHECK") +@Api("开线检查") +public class MesWcCheck extends BaseBean implements Serializable { + private static final long serialVersionUID = 8057329890155185557L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检查类型") + private String checkType; + + @Column(name = "CHECK_OBJ") + @ApiParam("检查对象") + private String checkObj; + + @Column(name = "CHECK_ITEM") + @ApiParam("检查项") + private String checkItem; + + @Column(name = "STANDARD") + @ApiParam("检查标准") + private String standard; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java new file mode 100644 index 0000000..fbf5699 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:57 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_CHECK_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("开线检查记录") +public class MesWcCheckRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2173902677953303765L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_ORDER") + @ApiParam("工单号") + private String workOrder; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检查类型") + private String checkType; + + @Column(name = "CHECK_OBJ") + @ApiParam("检查对象") + private String checkObj; + + @Column(name = "CHECK_ITEM") + @ApiParam("检查项") + private String checkItem; + + @Column(name = "STANDARD") + @ApiParam("检查标准") + private String standard; + + @Column(name = "CHECK_RESULT") + @ApiParam("检查结果") + private String checkResult; + + @Column(name = "CHECK_VALUE") + @ApiParam("检查值") + private String checkValue; + + @Column(name = "REASON") + @ApiParam("原因") + private String reason; + + @Column(name = "GROUP_CODE") + @ApiParam("组名") + private String groupCode; + + @Column(name = "OVERALL_RESULT") + @ApiParam("总体结果") + private Integer overAllResult; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java new file mode 100644 index 0000000..feeef17 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 2:31 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_EQUIPMENT") +@Api("工作单元设备关系表") +public class MesWcEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 2088600237918553286L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java new file mode 100644 index 0000000..e9bd56b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL") +@Api("工作单元") +public class MesWorkCell extends BaseBean implements Serializable { + private static final long serialVersionUID = -493313481197504121L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Column(name = "WORK_CELL_TYPE") + @ApiParam("工位类型") + private Integer workCellType; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + @Column(name = "WORK_CELL_IP") + @ApiParam("工作单元IP") + private String workCellIp; + + @Column(name = "WORK_CELL_PORT") + @ApiParam("工作单元端口") + private String workCellPort; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java new file mode 100644 index 0000000..2200ceb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/16 2:42 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("工位监控异常信息") +public class MesWorkCellMonitorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -5634446206963213556L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单") + private String workOrderNo; + + @Column(name = "STEP_CODE") + @ApiParam("工步") + private String stepCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序") + private String processCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程") + private String routeCOde; + + @Lob + @Column(name = "MESSAGE") + @ApiParam("异常信息") + private String message; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java new file mode 100644 index 0000000..2249726 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工作单元参数 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_PARAM") +@Api("mes工作单元参数") +public class MesWorkCellParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -3659425774085368499L; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_TYPE") + @ApiParam("参数类型") + private Integer paramType; + + @Column(name = "PARAM_MODEL") + @ApiParam("参数模式") + private Integer paramModel; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java new file mode 100644 index 0000000..a434107 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工作单元参数配置 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_PARAM_CFG") +@Api("工作单元参数配置") +public class MesWorkCellParamCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 1739991089354361293L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "IS_CHECK") + @ApiParam("是否必须校验") + private Integer isCheck; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java new file mode 100644 index 0000000..0329add --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : 工站队列 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 17:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_POINT") +@Api("工站队列") +public class MesWorkCellPoint extends BaseBean implements Serializable { + private static final long serialVersionUID = 2881841596678871526L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "QUEUE_SEQ") + @ApiParam("队列主表序号") + private Double queueSeq; + + @Column(name = "QUEUE_DETAIL_SEQ") + @ApiParam("队列明细表序号") + private Double queueDetailSeq; + + public double getQueueSeqVal() { + return this.queueSeq == null ? 0 : this.queueSeq; + } + + public double getQueueDetailSeqVal() { + return this.queueDetailSeq == null ? 0 : this.queueDetailSeq; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java new file mode 100644 index 0000000..5932327 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :配置表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_STATUS") +@Api("工位运行状态") +public class MesWorkCellStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 102975351699481524L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TIME_OUT_STATUS") + @ApiParam("超时状态") + private Integer timeOutStatus; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java new file mode 100644 index 0000000..3d35275 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工作中心 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CENTER") +@Api("工作中心") +public class MesWorkCenter extends BaseBean implements Serializable { + private static final long serialVersionUID = -1119897685621371682L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "ERP_WORK_CENTER") + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @Column(name = "WORK_VER") + @ApiParam("工作版本") + private String workVer; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Column(name = "RUNNING_STATUS") + @ApiParam("运行状态") + private String runningStatus; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java new file mode 100644 index 0000000..c4443eb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -0,0 +1,249 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.pcn.model.MesButtonFlagModel; +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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +}) +@Api("生产工单") +public class MesWorkOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 8065877030194822855L; + + @Column(name = "ORDER_NO", nullable = false) + @ApiParam("工单号") + private String orderNo; + + @Column(name = "PART_NO", nullable = false) + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "COMPLETE_QTY") + @ApiParam("完成数量") + private Double completeQty; + + @Column(name = "REPAIR_QTY") + @ApiParam("返修数量") + private Double repairQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数量") + private Double scrapQty; + + @Column(name = "SEQ") + @ApiParam("工单序号") + private Double seq; + + @Column(name = "WO_STATUS") + @ApiParam("工单状态") + private Integer workOrderStatus; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Column(name = "NEXT_ORDER") + @ApiParam("下一工单") + private String nextOrder; + + @Column(name = "PLAN_ORDER_NO") + @ApiParam("生产计划单号") + private String planOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "SCHEDULE_DATE") + @ApiParam("排产日期") + private String scheduleDate; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name = "WO_SOURCE") + @ApiParam("工单来源") + private String workOrderSource; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "SHIFT_GROUP") + @ApiParam("班组") + private String shiftGroup; + + @Column(name = "APPROVAL_STATUS") + @ApiParam("审批状态") + private Integer approvalStatus; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; + + @Column(name = "FI_COMPLETE_QTY") + @ApiParam("首检完成数量") + private Double fiCompleteQty; + + @Column(name = "FI_GENERATE_QTY") + @ApiParam("首检生成数量") + private Double fiGenerateQty; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value = "工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value = "工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value = "客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value = "班次名称") + public String shiftName; + + @Transient + @ApiParam(value = "班组名称") + public String shiftGroupName; + + @Transient + @ApiParam(value = "产品配置名称") + public String prodCfgName; + + @Transient + @ApiParam("区域代码名称") + private String areaCodeName; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") + public String endTimeEnd; + + @Transient + @ApiParam("mes生产工单页面按钮控制") + private MesButtonFlagModel mesButtonFlagModel; + + @Transient + @ApiParam("批量打包开窗页面查询工单=1") + private String pageType; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getCompleteQtyVal() { + return this.completeQty == null ? 0.0d : this.completeQty; + } + + public double getRepairQtyVal() { + return this.repairQty == null ? 0.0d : this.repairQty; + } + + public double getScrapQtyVal() { + return this.scrapQty == null ? 0.0d : this.scrapQty; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public int getWorkOrderStatusVal() { + return this.workOrderStatus == null ? 0 : this.workOrderStatus; + } + + public int getWorkOrderTypeVal() { + return this.workOrderType == null ? 0 : this.workOrderType; + } + + public int getApprovalStatusVal() { + return this.approvalStatus == null ? 0 : this.approvalStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java new file mode 100644 index 0000000..caba23a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -0,0 +1,231 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: wangjie + * @CreateDate:2019-09-19-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_ORDER_LOG", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("生产工单日志") +public class MesWorkOrderLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -7018645997937147427L; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "COMPLETE_QTY") + @ApiParam("完成数量") + private Double completeQty; + + @Column(name = "REPAIR_QTY") + @ApiParam("返修数量") + private Double repairQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数量") + private Double scrapQty; + + @Column(name = "SEQ") + @ApiParam("工单序号") + private Double seq; + + @Column(name = "WO_STATUS") + @ApiParam("工单状态") + private Integer workOrderStatus; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Column(name = "NEXT_ORDER") + @ApiParam("下一工单") + private String nextOrder; + + @Column(name = "PLAN_ORDER_NO") + @ApiParam("生产计划单号") + private String planOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "SCHEDULE_DATE") + @ApiParam("排产日期") + private String scheduleDate; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name = "WO_SOURCE") + @ApiParam("工单来源") + private String workOrderSource; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "SHIFT_GROUP") + @ApiParam("班组") + private String shiftGroup; + + @Column(name = "APPROVAL_STATUS") + @ApiParam("审批状态") + private Integer approvalStatus; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; + + @Column(name = "FI_COMPLETE_QTY") + @ApiParam("首检完成数量") + private Double fiCompleteQty; + + @Column(name = "FI_GENERATE_QTY") + @ApiParam("首检生成数量") + private Double fiGenerateQty; + + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value = "工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value = "工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value = "客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value = "班次名称") + public String shiftName; + + @Transient + @ApiParam(value = "班组名称") + public String shiftGroupName; + + @Transient + @ApiParam(value = "产品配置名称") + public String prodCfgName; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") + public String endTimeEnd; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getCompleteQtyVal() { + return this.completeQty == null ? 0.0d : this.completeQty; + } + + public double getRepairQtyVal() { + return this.repairQty == null ? 0.0d : this.repairQty; + } + + public double getScrapQtyVal() { + return this.scrapQty == null ? 0.0d : this.scrapQty; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public int getWorkOrderStatusVal() { + return this.workOrderStatus == null ? 0 : this.workOrderStatus; + } + + public int getWorkOrderTypeVal() { + return this.workOrderType == null ? 0 : this.workOrderType; + } + + public int getApprovalStatusVal() { + return this.approvalStatus == null ? 0 : this.approvalStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java new file mode 100644 index 0000000..3306bbf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 动作请求参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +public class ActionRequestBean implements Serializable { + + @ApiParam("事件代码") + @Deprecated + public String eventCode; + + @ApiParam("按钮代码") + public String buttonCode; + + @ApiParam("单个结果") + public Obj resultObject; + + @ApiParam("List请求集") + public List resultList; + + @ApiParam("Map请求集") + public Map resultMap; + + @ApiParam("目的状态") + private Integer destStatus; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java new file mode 100644 index 0000000..bfdcf1f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class AttrBean implements Serializable { + + @ApiParam("属性名称") + private String attrName; + + @ApiParam("属性名称别名") + private String attrNameAlias; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java new file mode 100644 index 0000000..5919ee5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ButtonBean implements Serializable { + @ApiParam(value = "按钮代码") + private String buttonCode; + + @ApiParam(value = "按钮名称") + private String buttonName; + + // 执行类方法,sql,或者标记 + @ApiParam(value = "执行内容") + private String methodContent; + + @ApiParam(value = "按钮描述") + private String buttonDesc; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java new file mode 100644 index 0000000..f70aaaa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/10 0010 - 15:28 + */ +@Data +@Api("数据采集Model") +public class DataAcquisitionModel { + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +// +// @ApiParam("组号") +// private String groupNo; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java new file mode 100644 index 0000000..f88ae24 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\28 19:50 + * @Modify: + **/ +@Data +public class DefectModel { + + private Long id; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("缺陷类型子集") + private List mesDefectList; + + public DefectModel() { + + } + + public DefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) { + this.id = id; + this.defectCode = defectCode; + this.defectName = defectName; + this.defectType = defectType; + this.defectTypeName = defectTypeName; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java new file mode 100644 index 0000000..ac086ba --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/4 3:09 下午 + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class EsopFileModel { + + private MesEsop esop; + + private MesFile file; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java new file mode 100644 index 0000000..418ab92 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/19 7:00 PM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class FastDfsDownloadModel { + + @ApiParam("部分相对路径") + private String dirPath; + + @ApiParam("文件名称") + private String fileName; + + @ApiParam("文件字节") + private byte[] fileByte; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java new file mode 100644 index 0000000..fd91386 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 11:42 AM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("生成条码模型") +public class GenSerialNoModel { + + @ApiParam("规则代码") + private String ruleCode; + + @ApiParam("规则描述") + private String ruleDesc; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户物料号") + private String custPartNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产地") + private String prodLocation; + + @ApiParam("前缀") + private String prefix; + + @ApiParam("编码规则") + private String numberRule; + + @ApiParam("序号长度") + private Integer serialnoLength; + + @ApiParam("增量") + private Integer serialnoIncrement; + + @ApiParam("最大值后循环") + private Integer isCycle; + + @ApiParam("当前编号前缀") + private String currentNumberPrefix; + + @ApiParam("当前序号") + private Integer currentSerialno; + + @ApiParam("当前编号") + private String currentNumber; + + + public GenSerialNoModel(String ruleCode) { + this.ruleCode = ruleCode; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java new file mode 100644 index 0000000..7883204 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes页面按钮控制model") +public class MesButtonFlagModel implements Serializable { + + @ApiParam("修改按钮") + private boolean updateButton; + + @ApiParam("按配置修改按钮") + private boolean updateButtonConfig; + + @ApiParam("下达按钮") + private boolean transmitButton; + +// @ApiParam("测试动态下达按钮") +// private boolean dynamicTransmitButtonTest; + + @ApiParam("启动按钮") + private boolean startUpButton; + + @ApiParam("暂停按钮") + private boolean suspendButton; + + @ApiParam("取消按钮") + private boolean revokeButton; + + @ApiParam("关闭按钮") + private boolean closeButton; + + @ApiParam("完成按钮") + private boolean completeButton; + + @ApiParam("关闭按钮-提醒") + private boolean closeButtonNoticeFlag; + + @ApiParam("维修任务按钮") + private boolean repairButton; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java new file mode 100644 index 0000000..57ba538 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesDefectModel { + + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @Transient + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @Transient + @ApiParam("缺陷分类子集") + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java new file mode 100644 index 0000000..7bad5fc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -0,0 +1,126 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:05 + * @Modify: + **/ +@Data +public class MesProdBindRecordModel { + private Long id; + private String itemPartNo; + private String itemPartName; + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + private String kpSn; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + @ApiParam("创建时间") + private String createUser; + @ApiParam("创建时间") + private String createDatetime; + @ApiParam("修改人") + private String modifyUser; + @ApiParam("修改时间") + private String modifyDatetime; + @ApiParam("产品条码") + private String serialNumber; + @ApiParam("关联批次") + private String lotNo; + + public MesProdBindRecordModel() { + + } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.dismantleQty = dismantleQty; + this.lotNo = lotNo; + } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String lotNo) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.lotNo = lotNo; + } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.serialNumber = serialNumber; + this.lotNo = lotNo; + } + + public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) { + this.itemPartNo = itemPartNo; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.serialNumber = serialNumber; + this.lotNo = lotNo; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java new file mode 100644 index 0000000..e6504ec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesStationBomModel { + + private Long id; + @ApiParam("子物料编码") + private String itemPartNo; + @ApiParam("子物料名称") + private String itemPartName; + @ApiParam("产品数量") + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + + public MesStationBomModel() { + + } + + public MesStationBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } + + public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java new file mode 100644 index 0000000..f3b4227 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/25 7:41 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("PLC交互model") +public class PLCInteracticeModel { + + private String serverIp; + + private String serverPort; + + private String mwContext; + + private String protocol; + + private String plcCode; + + private String dataType; + + private String userName; + + private String password; + + private Integer enabled; + + private String realm; + + private String tag; + + private String value; + + private String comment; + + private String authenKey; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java new file mode 100644 index 0000000..ed2bc6c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/2/21 17:20 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工位监控观察者对象") +public class PcsObserverStatusModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("运行状况") + private Boolean runningStatus; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java new file mode 100644 index 0000000..ba753cc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author: wangjie + * @CreateDate: 2019/9/23 8:06 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProdPackageModel { + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("班次名称") + private String shiftName; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam("工单数量") + private Double workOrderQty; + + @ApiParam("完成数量") + private Double completeQty; + + @ApiParam("包装规格数量") + private Double packSpecQty; + + @ApiParam("包装规格") + private String packSpec; + + @ApiParam("数量") + private Double qty; + + @ApiParam("特殊批次") + private String fixLotNo; + + @ApiParam("包装集合") + private List packageList; + + @ApiParam("打印状态文字") + private String printStrStatus; + + @ApiParam("包装层级名称") + private String packLevelName; + + @ApiParam("是否封箱名称") + private String isSealedName; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java new file mode 100644 index 0000000..727e482 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProductDataModel { + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java new file mode 100644 index 0000000..f2ec4a3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2020\1\13 17:23 + * @Modify: + **/ +@Data +public class QcCheckStandardModel { + + private Long id; + + @ApiParam("列头") + private String title; + + private List resultList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java new file mode 100644 index 0000000..bdb5567 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QueueJisModel implements Serializable { + + @ApiParam("主队列编号") + private String jisNo; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("车号") + private String carNo; + + @ApiParam("排序") + private Double seq; + + @ApiParam("状态") + private Integer status; + + @ApiParam("产品配置代码") + private String prodCfgCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("明细状态") + private Integer detailStatus; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("明细整体状态") + private Integer finalStatus; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("明细状态名称") + private String detailStatusName; + + @ApiParam("明细整体状态名称") + private String finalStatusName; + + @ApiParam("颜色") + private String color; + + public String getStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); + } + + public String getDetailStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); + } + + public String getFinalStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); + } + + public QueueJisModel() { + } + + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { + this.jisNo = jisNo; + this.vinCode = vinCode; + this.carNo = carNo; + this.seq = seq; + this.status = status; + this.prodCfgCode = prodCfgCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.detailStatus = detailStatus; + this.serialNumber = serialNumber; + this.finalStatus = finalStatus; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java new file mode 100644 index 0000000..1a7965e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : JIT队列列表Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT队列列表Model") +public class QueueOrderModel implements Serializable { + private Long id; + @ApiParam("队列序号") + public Double queueSeq; + @ApiParam("队列明细序号") + public Double queDetailSeq; + @ApiParam("客户标识号") + public String custFlagNo; + @ApiParam("产品配置名称") + public String prodCfgNameRdd; + @ApiParam("产品类型名称") + public String categoryNameRdd; + @ApiParam("产品条码") + public String serialNumber; + @ApiParam("物料号") + public String partNo; + @ApiParam("物料名称") + public String partNameRdd; + @ApiParam("条码状态") + public Integer snStatus; + @ApiParam("生产类型") + public String workType; + @Transient + @ApiParam("显示颜色") + private String color; + @ApiParam("工厂代码") + private String organizeCode; + @ApiParam("展示行数") + private Integer prodNum; + @ApiParam("产线") + private String workCenterCode; + @ApiParam("工位") + private String workCellCode; + + public QueueOrderModel() { + } + + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + } + + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java new file mode 100644 index 0000000..6a85e20 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java @@ -0,0 +1,155 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.*; + +import java.util.List; + +/** + * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-29-11:58 + * @Modify: + **/ +public class RequestModel { + + private List mesDefectRecordList; // 不良/缺陷记录数据集 + + private List mesRepairRecordList; // 维修记录数据集 + + private List dismantleRecordList; // 拆解记录数据集 + + private List workOrderList; // 工单数据集 + + private List partList; // 物料数据集 + + private List queueOrderList; // 生产队列数据集 + + private Double currentSeq; // 生产队列中的当前序列号 + + private Double nextSeq; // 生产队列中的下一个序列号 + + private Integer srcStatus; // 源状态 + + private Integer destStatus; // 目的状态 + + private List orderNoList;//工单编号 + + private ActionRequestBean actionRequestBean;//工单状态 + + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { + this.queueOrderList = queueOrderList; + this.currentSeq = currentSeq; + this.nextSeq = nextSeq; + } + + public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { + this.queueOrderList = queueOrderList; + this.srcStatus = srcStatus; + this.destStatus = destStatus; + } + + public RequestModel(List workOrderList, List partList) { + this.workOrderList = workOrderList; + this.partList = partList; + } + + public List getMesDefectRecordList() { + return mesDefectRecordList; + } + + public void setMesDefectRecordList(List mesDefectRecordList) { + this.mesDefectRecordList = mesDefectRecordList; + } + + public List getMesRepairRecordList() { + return mesRepairRecordList; + } + + public void setMesRepairRecordList(List mesRepairRecordList) { + this.mesRepairRecordList = mesRepairRecordList; + } + + public List getDismantleRecordList() { + return dismantleRecordList; + } + + public void setDismantleRecordList(List dismantleRecordList) { + this.dismantleRecordList = dismantleRecordList; + } + + public List getWorkOrderList() { + return workOrderList; + } + + public RequestModel() { + } + + public void setWorkOrderList(List workOrderList) { + this.workOrderList = workOrderList; + } + + public List getPartList() { + return partList; + } + + public void setPartList(List partList) { + this.partList = partList; + } + + public List getQueueOrderList() { + return queueOrderList; + } + + public void setQueueOrderList(List queueOrderList) { + this.queueOrderList = queueOrderList; + } + + public void setOrderNoList(List orderNoList) { + this.orderNoList = orderNoList; + } + + public List getOrderNoList() { + return orderNoList; + } + + public void setActionRequestBean(ActionRequestBean actionRequestBean) { + this.actionRequestBean = actionRequestBean; + } + + public ActionRequestBean getActionRequestBean() { + return actionRequestBean; + } + + public Double getCurrentSeq() { + return currentSeq == null ? 0.0d : currentSeq; + } + + public void setCurrentSeq(Double currentSeq) { + this.currentSeq = currentSeq; + } + + public Double getNextSeq() { + return nextSeq == null ? 0.0d : nextSeq; + } + + public void setNextSeq(Double nextSeq) { + this.nextSeq = nextSeq; + } + + public Integer getSrcStatus() { + return srcStatus == null ? 0 : srcStatus; + } + + public void setSrcStatus(Integer srcStatus) { + this.srcStatus = srcStatus; + } + + public Integer getDestStatus() { + return destStatus == null ? 0 : destStatus; + } + + public void setDestStatus(Integer destStatus) { + this.destStatus = destStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java new file mode 100644 index 0000000..831a997 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 打印信息封装 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息封装") +public class SnPrintDataModel { + + @ApiParam("打印数据") + private List valueList; + + @ApiParam("打印模板及参数") + private MesLabelTemplate labelTemplate; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java new file mode 100644 index 0000000..0f1d4a6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 打印信息汇总 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息汇总") +public class SnPrintModel extends StepPrintSnModel { + + @ApiParam("过程条码") + private SnPrintDataModel serialPrintDataModel; + + @ApiParam("产品条码") + private SnPrintDataModel prodPrintDataModel; + + @ApiParam("包装条码") + private SnPrintDataModel packPrintDataModel; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java new file mode 100644 index 0000000..e894595 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 3:11 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工位BOM model") +public class StationBomModel extends MesStationBom { + + @ApiParam("上料数量") + private Long cellFeedQty; + + @ApiParam("是否上料数量满足") + private Boolean isFeedSatisfied; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java new file mode 100644 index 0000000..978fd4b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 工位结果bean + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-24 + * @Modify: + **/ +@Data +public class StationResultBean implements Serializable { + + /** + * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 + * moduleContent组件内容,taskComplete整个扫描完成 + */ + @ApiParam("业务类型") + private String busiType; + + /** + * 对于相同业务类型的数据，区分不同数据类型。 + * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， + * image-图片 + */ + @ApiParam("数据类型") + private String dataType; + + @ApiParam("执行结果信息") + private String message; + + @ApiParam("List结果集") + private List resultList; + + @ApiParam("结果对象") + private Object resultObj; + + @ApiParam("Map结果集") + public Map resultMap; + + @ApiParam("List结果集的属性") + private List dataAttrList; + + @ApiParam("图片路径") + private String imageUrl; + + @ApiParam("多个数据集") + private List> stationResultBeans; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java new file mode 100644 index 0000000..7b2296f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/11/12 3:50 下午 + * @Description: 下拉工步参数对象 + **/ +@Data +@Api("下拉工步参数对象") +public class StepParamsModel implements Serializable { + private static final long serialVersionUID = -6361645141217616499L; + + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数代码") + private Map paramValues; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java new file mode 100644 index 0000000..c7f4937 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.beans.Transient; +import java.util.List; + +/** + * @Description: 打印条码工步， 打印信息模板 + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息模板") +public class StepPrintSnModel extends MesProduceSn { + @ApiParam("打印描述") + private String printDesc; + + @ApiParam("条码") + private String barCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("批次号") + private String batchNo; + + @ApiParam("箱数量") + private String boxQty; + + @ApiParam("订单号") + private String orderNo; + + @ApiParam("生产日期") + private String productionTime; + + @ApiParam("包装编码") + private String packageNo; + + @ApiParam("包装规格") + private String packageSpec; + + @ApiParam("供应商") + private String supplier; + + @ApiParam("客户名称") + private String customerName; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("客户物料名称") + private String customerPartName; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam("特殊批号") + private String fixLotNo; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java new file mode 100644 index 0000000..0ef0670 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Collection; + +@Data +@Api("工步返回信息") +public class StepResult { + + private boolean isCompleted; + + private T data; + + private Collection dataCollection; + + private String msg; + + public static StepResult getSuccessComplete() { + return new StepResult(true, ""); + } + + public static StepResult getNonComplete() { + return new StepResult(false, ""); + } + + public static StepResult getSuccessComplete(String msg) { + return new StepResult(true, msg); + } + + public static StepResult getNonComplete(String msg) { + return new StepResult(false, msg); + } + + public static StepResult getSuccessData(T data, String msg) { + return new StepResult<>(true, data, msg); + } + + public static StepResult getSuccessData(Collection data, String msg) { + return new StepResult(true, data, msg); + } + + private StepResult() { + } + + private StepResult(boolean isCompleted) { + this.isCompleted = isCompleted; + } + + private StepResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public StepResult(boolean isCompleted, T data, String msg) { + this.isCompleted = isCompleted; + this.data = data; + this.msg = msg; + } + + public StepResult(boolean isCompleted, Collection dataCollection, String msg) { + this.isCompleted = isCompleted; + this.dataCollection = dataCollection; + this.msg = msg; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java new file mode 100644 index 0000000..ad0541e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-06-03-11:44 + * @Modify: + **/ + +public class TorqueModel { + private Long id; + + private Double upperLimit; + + private Double lowerLimit; + + private Double torqueValue; + + private boolean ok; + + private String color; + + public boolean isOk() { + return ok; + } + + public void setOk(boolean ok) { + this.ok = ok; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Double getUpperLimit() { + return upperLimit; + } + + public void setUpperLimit(Double upperLimit) { + this.upperLimit = (upperLimit == null ? 0 : upperLimit); + } + + public Double getLowerLimit() { + return lowerLimit; + } + + public void setLowerLimit(Double lowerLimit) { + this.lowerLimit = (lowerLimit == null ? 0 : lowerLimit); + } + + public Double getTorqueValue() { + return torqueValue; + } + + public void setTorqueValue(Double torqueValue) { + this.torqueValue = (torqueValue == null ? 0 : torqueValue); + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java new file mode 100644 index 0000000..e1e1c93 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 8:06 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("开线管控model") +public class WcCheckModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工单") + private String workOrder; + + @ApiParam("产品号") + private String partNo; + + @ApiParam("是否通过") + private Integer isPass; + + @ApiParam("开线信号") + private Integer onlineSignal; + + @ApiParam("开线对象") + MesWcCheckRecord onlineSignalEqu; + + @ApiParam("需要展示的数据") + private Map titleMap; + + @ApiParam("对象list和列关系") + private Map> dataColumnRelation; + + @ApiParam("重构map") + private Map> dataMap; + + public WcCheckModel initialWcCheckModel() { + WcCheckModel wcCheckModel = new WcCheckModel(); + wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); + wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); + onlineSignalEqu = new MesWcCheckRecord(); + wcCheckModel.setTitleMap(new LinkedHashMap<>()); + wcCheckModel.setDataMap(new LinkedHashMap<>()); + wcCheckModel.setDataColumnRelation(new LinkedHashMap<>()); + return wcCheckModel; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java new file mode 100644 index 0000000..02bca6e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.IfDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 14:14 + * @Modify: + **/ +public interface IfDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java new file mode 100644 index 0000000..9a4d6be --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.IfPackageDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 17:47 + * @Modify: + **/ +public interface IfPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java new file mode 100644 index 0000000..9d362f1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.IfProductOffLine; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 17:48 + * @Modify: + **/ +public interface IfProductOffLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java new file mode 100644 index 0000000..5f1dbef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionIf; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 11:21 + * @Modify: + **/ +public interface MesActionIfRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java new file mode 100644 index 0000000..d5e2954 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesActionMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java new file mode 100644 index 0000000..80cb307 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesAction; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesActionRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java new file mode 100644 index 0000000..c91b713 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java new file mode 100644 index 0000000..42b5b30 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java new file mode 100644 index 0000000..6153d23 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeedRecord; + +/** + * @Description : 工位投料履历持久化类 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-17 09:53 + * @Modify: + **/ +public interface MesCellFeedRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java new file mode 100644 index 0000000..462dff4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesCellFeedRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java new file mode 100644 index 0000000..6b43fa6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : crish + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Repository +public interface MesConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java new file mode 100644 index 0000000..cbca918 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustProdLine; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-11:15 + * @Modify: + **/ +@Repository +public interface MesCustProdLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java new file mode 100644 index 0000000..72e72bc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomerPart; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesCustomerPartRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java new file mode 100644 index 0000000..c006be6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomer; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-22-16:12 + * @Modify: + **/ +@Repository +public interface MesCustomerRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java new file mode 100644 index 0000000..d285a59 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDataObject; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:59 PM + * @Description: + **/ +public interface MesDataObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java new file mode 100644 index 0000000..36faed5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesDatasourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java new file mode 100644 index 0000000..c0ecd89 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectCause; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:04 + * @Modify: + **/ +public interface MesDefectCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java new file mode 100644 index 0000000..c8a7a7b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:05 + * @Modify: + **/ +public interface MesDefectRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java new file mode 100644 index 0000000..274f334 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:04 + * @Modify: + **/ +public interface MesDefectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java new file mode 100644 index 0000000..e093fe2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:06 + * @Modify: + **/ +public interface MesDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java new file mode 100644 index 0000000..9d54073 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEquipment; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java new file mode 100644 index 0000000..103e176 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesEsopRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java new file mode 100644 index 0000000..6b15531 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEventAction; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEventActionRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java new file mode 100644 index 0000000..cfa330f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEvent; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEventRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java new file mode 100644 index 0000000..0050530 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFiCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesFiCfgRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java new file mode 100644 index 0000000..16383bc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java new file mode 100644 index 0000000..da57b4f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : crish + * @CreateDate : 2019-05-15 + * @Modify: + **/ +@Repository +public interface MesKpDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java new file mode 100644 index 0000000..373ab6d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpsnRule; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesKpsnRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java new file mode 100644 index 0000000..ce73083 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface MesLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java new file mode 100644 index 0000000..16f04a4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface MesLabelTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java new file mode 100644 index 0000000..d064c63 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesMethodRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java new file mode 100644 index 0000000..46e8f5d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:42 + */ +@Repository +public interface MesMonitorTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java new file mode 100644 index 0000000..95eb821 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:43 + */ +@Repository +public interface MesMonitorTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java new file mode 100644 index 0000000..d3b014d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberRule; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:22 PM + * @Description: + **/ +@Repository +public interface MesNumberRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java new file mode 100644 index 0000000..11299b0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberSerialno; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:23 PM + * @Description: + **/ + +@Repository +public interface MesNumberSerialnoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java new file mode 100644 index 0000000..c1a67b2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:59 PM + * @Description: + **/ +public interface MesObjectCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java new file mode 100644 index 0000000..d10efa8 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPLCConfigure; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPLCConfigureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java new file mode 100644 index 0000000..fc409e1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackSpec; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPackSpecRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java new file mode 100644 index 0000000..6d2fe27 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 10:33 上午 + * @Description: + **/ +public interface MesPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java new file mode 100644 index 0000000..eb7c894 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 10:39 上午 + * @Description: + **/ +public interface MesPackageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java new file mode 100644 index 0000000..dde5b62 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageTravel; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 2:57 下午 + * @Description: + **/ +public interface MesPackageTravelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java new file mode 100644 index 0000000..eb12a69 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPartCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java new file mode 100644 index 0000000..0324dd1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java new file mode 100644 index 0000000..87029c6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesPatternJisRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java new file mode 100644 index 0000000..c9e3e97 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnConnectLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnConnectLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java new file mode 100644 index 0000000..1ae09bf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java new file mode 100644 index 0000000..256e8da --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnSyncCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java new file mode 100644 index 0000000..a217480 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncErrorLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnSyncErrorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java new file mode 100644 index 0000000..111a055 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSysUserOffline; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-02 + * @Modify: + **/ +@Repository +public interface MesPcnSysUserOfflineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java new file mode 100644 index 0000000..66621f9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTaskLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Repository +public interface MesPcnTaskLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java new file mode 100644 index 0000000..68295ee --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTask; +import org.springframework.stereotype.Repository; + +/** + * @Description :mes-pcn定时任务清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Repository +public interface MesPcnTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java new file mode 100644 index 0000000..c4ba8c9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPlanOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:08 + * @Modify: + **/ +@Repository +public interface MesPlanOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java new file mode 100644 index 0000000..add5aac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPlc; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/26 7:47 PM + * @Description: + **/ +@Repository +public interface MesPlcRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java new file mode 100644 index 0000000..d931c12 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java new file mode 100644 index 0000000..2b9ba19 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdBindRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdBindRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java new file mode 100644 index 0000000..c93700b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfgDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java new file mode 100644 index 0000000..1413862 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java new file mode 100644 index 0000000..cf70703 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdPack; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdPackRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java new file mode 100644 index 0000000..7a55397 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java new file mode 100644 index 0000000..93e532b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteOptParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteOptParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java new file mode 100644 index 0000000..6827df9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdScatterCfgBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 18:03 + */ +@Repository +public interface MesProdScatterCfgBomRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java new file mode 100644 index 0000000..50602d5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:28 + * @Modify: + **/ +@Repository +public interface MesProduceCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java new file mode 100644 index 0000000..2edb306 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCtgyPicture; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:35 + * @Modify: + **/ +public interface MesProduceCtgyPictureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java new file mode 100644 index 0000000..e049715 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:10 + * @Modify: + **/ +@Repository +public interface MesProduceSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java new file mode 100644 index 0000000..607e64c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel; +import org.springframework.stereotype.Repository; + +/** + * @Description : 条码履历Dao层接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 16:36 + * @Modify: + **/ +@Repository +public interface MesProduceSnTravelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java new file mode 100644 index 0000000..eb8debf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProductDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java new file mode 100644 index 0000000..de434ac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductEncodeCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-17-17:10 + * @Modify: + **/ +@Repository +public interface MesProductEncodeCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java new file mode 100644 index 0000000..8c909e7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckData; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 16:43 + * @Modify: + **/ +public interface MesQcCheckDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java new file mode 100644 index 0000000..1348b9c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 14:58 + * @Modify: + **/ +public interface MesQcCheckStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java new file mode 100644 index 0000000..bd19fef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJisDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java new file mode 100644 index 0000000..8a08948 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java new file mode 100644 index 0000000..82bbefb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrderDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:12 + * @Modify: + **/ +@Repository +public interface MesQueueOrderDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java new file mode 100644 index 0000000..989e14f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:11 + * @Modify: + **/ +@Repository +public interface MesQueueOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java new file mode 100644 index 0000000..1f048c1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesRawPartSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java new file mode 100644 index 0000000..1325e76 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepairRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:06 + * @Modify: + **/ +public interface MesRepairRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java new file mode 100644 index 0000000..2e22c77 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepair; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-08-17:13 + * @Modify: + **/ +@Repository +public interface MesRepairRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java new file mode 100644 index 0000000..f217869 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRouteProcessCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java new file mode 100644 index 0000000..5749bbd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRouteProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java new file mode 100644 index 0000000..92800fd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRoute; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java new file mode 100644 index 0000000..0f3e5eb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrapRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:07 + * @Modify: + **/ +public interface MesScrapRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java new file mode 100644 index 0000000..4dbf260 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrap; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-08-17:13 + * @Modify: + **/ +@Repository +public interface MesScrapRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java new file mode 100644 index 0000000..544c627 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShiftGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesShiftGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java new file mode 100644 index 0000000..7f5b1a7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShift; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-13:53 + * @Modify: + **/ +@Repository +public interface MesShiftRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java new file mode 100644 index 0000000..b3cc087 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShiftRest; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesShiftRestRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java new file mode 100644 index 0000000..f5fd71f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStationBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java new file mode 100644 index 0000000..f7b386f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStepParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java new file mode 100644 index 0000000..5f3f562 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java new file mode 100644 index 0000000..6489cec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTime; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesTimeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java new file mode 100644 index 0000000..d2be5f1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTorqueDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesTorqueDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java new file mode 100644 index 0000000..02911ac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTypeCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\4 10:34 + * @Modify: + **/ +public interface MesTypeCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java new file mode 100644 index 0000000..71d7efa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCheckRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java new file mode 100644 index 0000000..cbf9cae --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheck; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java new file mode 100644 index 0000000..0e70427 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/28 12:04 PM + * @Description: + **/ +public interface MesWcEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java new file mode 100644 index 0000000..672947b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellMonitorLog; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesWorkCellMonitorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java new file mode 100644 index 0000000..98f4a1c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParamCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellParamCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java new file mode 100644 index 0000000..3a714cf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-30 + * @Modify: + **/ +@Repository +public interface MesWorkCellParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java new file mode 100644 index 0000000..52319d0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint; +import org.springframework.stereotype.Repository; + +/** + * @Description :工站队列Dao层接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 14:40 + * @Modify: + **/ +@Repository +public interface MesWorkCellPointRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java new file mode 100644 index 0000000..ce59423 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java new file mode 100644 index 0000000..1295a8d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 11:21 + * @Modify: + **/ +@Repository +public interface MesWorkCellStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java new file mode 100644 index 0000000..e24b5db --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCenter; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCenterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java new file mode 100644 index 0000000..fea2dfb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrderLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-19-17:13 + * @Modify: + **/ +@Repository +public interface MesWorkOrderLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java new file mode 100644 index 0000000..40676c4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:13 + * @Modify: + **/ +@Repository +public interface MesWorkOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java new file mode 100644 index 0000000..3db9a90 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -0,0 +1,413 @@ +package cn.estsh.i3plus.pojo.mes.pcn.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.pcn.bean.*; +import org.springframework.util.StringUtils; + +/** + * @Description: + * @Reference: Mes 条件封装 + * @Author: Crish + * @CreateDate:2019-04-22-14:58 + * @Modify: + **/ +public class MesHqlPack { + + + /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * MES PCN系统配置信息条件查询 + * + * @param mesConfig + * @return + */ + public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); + } + if (!StringUtils.isEmpty(mesConfig.getCfgName())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); + } + if (!StringUtils.isEmpty(mesConfig.getIsValid())) { + DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); + } + return packBean; + } + + /** + * 根据打印模板的模板代码查询模板信息 + * + * @param mesLabelTemplate + * @return + */ + public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); + return packBean; + } + + /** + * 获取工作中心下所有的投料数据 + * + * @param mesCellFeed + * @param org + * @return + */ + public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); + return packBean; + } + + + /** + * 获取原材料扫描信息的对应工序BOM + * + * @param stationBom + * @param rawPartSn + * @return + */ + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); + DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); + return packBean; + } + + /** + * 生产工单查询条件封装 + * + * @param mesWorkOrder + * @return + */ + public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); + } else { + if (!StringUtils.isEmpty(mesWorkOrder.getPageType()) && "1".equals(mesWorkOrder.getPageType())) { + DdlPreparedPack.getInPackArray(new Object[]{MesPcnEnumUtil.WORK_ORDER_STATUS.OPEN.getValue(), MesPcnEnumUtil.WORK_ORDER_STATUS.PAUSE.getValue(), + MesPcnEnumUtil.WORK_ORDER_STATUS.COMPLETE.getValue()}, "workOrderStatus", packBean); + } + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getApprovalStatus())) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getIsValid())) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); + } + + // 时间段查询 + if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } + + /** + * 物料信息查询条件封装 + * + * @param mesPart + * @return + */ + public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + + if (!StringUtils.isEmpty(mesPart.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesPart.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); + } + if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); + } + if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); + } + return packBean; + } + + /** + * MES 客户信息查询条件封装 + * + * @param customer + * @return + */ + public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); + if (!StringUtils.isEmpty(customer.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(customer.getCustomerName())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); + } + + return packBean; + } + + /** + * MES PCN系维修信息条件查询 + * + * @param mesRepair + * @return + */ + public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesRepair.getRepairCode())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); + } + if (!StringUtils.isEmpty(mesRepair.getRepairName())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); + } + if (!StringUtils.isEmpty(mesRepair.getRepairType())) { + DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); + } + return packBean; + } + + /** + * MES PCN系维修信息条件查询 + * + * @param mesScrap + * @return + */ + public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesScrap.getScrapCode())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); + } + if (!StringUtils.isEmpty(mesScrap.getScrapName())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); + } + if (!StringUtils.isEmpty(mesScrap.getScrapType())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean); + } + return packBean; + } + + /** + * MES PCN缺陷原因信息条件查询 + * + * @param mesDefectCause + * @return + */ + public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean); + } + if (!StringUtils.isEmpty(mesDefectCause.getDcName())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean); + } + if (!StringUtils.isEmpty(mesDefectCause.getDcType())) { + DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean); + } + return packBean; + } + + /** + * 按条件分页查询产品条码补打印数据 + * + * @param mesProduceSn + * @return + */ + public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { + DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); + if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { + DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); + } + + // 时间段查询 + if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterTimeStart(), + mesProduceSn.getOutWorkCenterTimeEnd(), + "outWorkCenterTime", packBean, true); + } + return packBean; + } + + /** + * 按条件分页查询包装条码补打印数据 + * + * @param mesPackage + * @return + */ + public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) { + + DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPackage.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { + DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesPackage.getCreateDateTimeStart(), + mesPackage.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + + return packBean; + } + + + /** + * MES班组信息查询条件封装 + * + * @param shiftGroup + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { + + DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); + if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); + } + if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); + } + if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + + public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } + + + /** + * 按条件分页查询类型信息数据 + * + * @param typeCfg + * @return + */ + public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) { + + DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode()); + if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); + } + if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean); + } + if (!StringUtils.isEmpty(typeCfg.getTypeCode())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean); + } + + return packBean; + } +} From d5b2f4a4cd7d99c33b10f650d1bc89c2df3c1791 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 30 Nov 2020 21:08:33 +0800 Subject: [PATCH 189/329] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E5=8F=B7=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/mes/bean/MesBoardShift.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 4 ++++ .../i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 4 ++-- .../pojo/mes/model/mgn/bj/SparePartStockModel.java | 17 +++++++++++++++++ 5 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java index 4c1f609..00b7a77 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java @@ -41,4 +41,8 @@ public class MesBoardShift extends BaseBean implements Serializable { @Column(name = "SHIFT_NAME") @ApiParam("班次名称") private String shiftName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 5838d4a..755e931 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -217,7 +217,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, - String workCenterCode, String workCellCode, Double qty, Double finsihQty) { + String workCenterCode, String workCellCode, Double qty, Double finsihQty, String groupNo) { this.id = id; this.seq = seq; this.partNo = partNo; @@ -235,6 +235,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.workCellCode = workCellCode; this.qty = qty; this.finsihQty = finsihQty; + this.groupNo = groupNo; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 3af7858..ae19bfc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -92,6 +92,10 @@ public class MesStationBom extends BaseBean implements Serializable { private Double feedWarningQty; @Transient + @ApiParam("标准包规数量") + private Double partSpecQty = 0d; + + @Transient @ApiParam("是否已绑定") private Boolean isBind; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 5807d66..500b492 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -18,13 +18,13 @@ public class MgnBjBoardModel implements Serializable { private Integer qty; @ApiParam("jsa数量") - private Integer jsaQty; + private Integer jsaQty = 0; @ApiParam("jsa数量") private Integer jsaRate; @ApiParam("完成数量") private Integer completeQty = 0; @ApiParam("完成率") - private Integer completeRate; + private Integer completeRate = 0; @ApiParam("总数量") private Integer totalQty = 0; @ApiParam("预警数量") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java new file mode 100644 index 0000000..1c05c3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/11/29 5:40 PM + * @Modify: + */ +@Data +public class SparePartStockModel { + + private Integer maxQty; + + private Integer minQty; +} From e1783e5e460a9a16c7bbda5508010c7c83e8d256 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 1 Dec 2020 11:32:01 +0800 Subject: [PATCH 190/329] pom --- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 From 0deb9b4733fa4e3b276beb687529e3e534923db6 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 1 Dec 2020 14:31:55 +0800 Subject: [PATCH 191/329] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E8=A5=84=E9=98=B3?= =?UTF-8?q?=E6=BB=91=E9=81=93=E5=B7=A5=E5=8E=82=E9=9C=80=E6=B1=82:?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8=E7=BC=96=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=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/MesRawPartSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index dd7a8eb..0561548 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -70,6 +70,10 @@ public class MesRawPartSn extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } From 47e6a86ecdd07b7f1d20daae201636e10a3b8d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 1 Dec 2020 17:30:53 +0800 Subject: [PATCH 192/329] =?UTF-8?q?=E3=80=90=E5=A4=A9=E6=B4=A5bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 11 +++++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 3 +++ 2 files changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index ef9dddb..34acd47 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -130,4 +130,15 @@ public class MesDefectRecord extends BaseBean implements Serializable { this.defectName = defectName; this.defectQty = defectQty; } + + public MesDefectRecord(String partNo, String workOrderNo, String partName, String workCenterCode, + String workCellCode, String modifyUser, String modifyDatetime) { + this.partNo = partNo; + this.workOrderNo = workOrderNo; + this.partName = partName; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 2eca8bb..3be6af1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -84,6 +84,9 @@ public class TJMgnBoardModel extends BaseBean implements Serializable { @ApiParam("结束工单") private String workOrderNoEnd; + @ApiParam("产线") + private String workCenterCode; + public TJMgnBoardModel() { } From a94b5dd0b034269ef27b864f0c408679ceb7e007 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 1 Dec 2020 21:37:58 +0800 Subject: [PATCH 193/329] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java index cbc02b8..0768d03 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -48,7 +48,7 @@ public class MesBoardLine extends BaseBean implements Serializable { @Column(name = "PLAN_TAKT") @ApiParam("计划节拍") - private Integer planTakt; + private Double planTakt; @Column(name = "PASS_PERCENT_MAX") @ApiParam("良品率上限") @@ -60,7 +60,7 @@ public class MesBoardLine extends BaseBean implements Serializable { @Column(name = "CAR_RUN_TIME") @ApiParam("小车运行时间（分）") - private Integer carRunTime; + private Double carRunTime; @Column(name = "TEST_CAR_SUM") @ApiParam("调试车数") From 785152dbfa1c47d3c136e8a1759a7d5184ed8233 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 1 Dec 2020 23:11:28 +0800 Subject: [PATCH 194/329] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B5=8B=E4=BA=88=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index 1496c14..b49778e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -80,8 +80,9 @@ public class WmsInterfaceDataRecord extends BaseBean { @Column(name = "ERP_DOC_NO") private String erpDocNo; + // 必须有默认值 @ApiParam("ERP状态代码") - @Column(name = "ERP_STATUS_CODE") + @Column(name = "ERP_STATUS_CODE", columnDefinition = "varchar(225) default ''") private String erpStatusCode; @ApiParam("ERP状态描述") From a4093d18d1124b73a0bdc3472ba79f617e450c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 2 Dec 2020 13:48:57 +0800 Subject: [PATCH 195/329] =?UTF-8?q?=E3=80=9012420=2019048=20=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E4=BA=8C=E6=A3=80=E5=A2=9E=E5=8A=A0UNPACK=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=2020201112=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/mes/bean/MesPackageDetail.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index ca64a64..beb90ed 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -27,9 +27,9 @@ import java.io.Serializable; @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PART_NO"), @Index(columnList = "PACKAGE_NO2") -}, uniqueConstraints = { +}/*, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) -}) +}*/) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 6980459490465566975L; From 9b57f47af67072371c2b8fdb662a2916ab440934 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Wed, 2 Dec 2020 16:58:02 +0800 Subject: [PATCH 196/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From c20922a4558510af2ea57d0659e2e084d305eba0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 2 Dec 2020 17:34:22 +0800 Subject: [PATCH 197/329] =?UTF-8?q?Fix=20bug#12879=20COGI=E8=B0=83?= =?UTF-8?q?=E8=B4=A6=E6=94=AF=E6=8C=81=E5=87=BA=E5=BA=93=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= 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, 3 insertions(+), 2 deletions(-) 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 14d440e..4699854 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 @@ -869,8 +869,9 @@ public class WmsEnumUtil { WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), OTHER_IN(730, "OTHER_IN", "其它入库"), OTHER_OUT(740, "OTHER_OUT", "其它出库"), - COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"), - SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR + COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"), + SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), + COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR private int value; private String code; From 02d002b9586a54c439cb4915c0c86d10a45937bc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 12:15:14 +0800 Subject: [PATCH 198/329] =?UTF-8?q?package=20detail=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20=E8=81=94=E5=90=88=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.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/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index beb90ed..0f28b91 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -26,10 +26,10 @@ import java.io.Serializable; @Index(columnList = "PACKAGE_NO"), @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PART_NO"), - @Index(columnList = "PACKAGE_NO2") -}/*, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) -}*/) + @Index(columnList = "PACKAGE_NO2"), + @Index(columnList = "ORGANIZE_CODE,PACKAGE_NO,SERIAL_NUMBER"), + @Index(columnList = "PACKAGE_NO,SERIAL_NUMBER") +}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 6980459490465566975L; From 13868d5cd171046ab35837aa3b57a1ef3b42f267 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 12:36:54 +0800 Subject: [PATCH 199/329] =?UTF-8?q?producesn=20=E5=A2=9E=E5=8A=A0=E7=B4=A2?= =?UTF-8?q?=E5=BC=95?= 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 | 1 + 1 file changed, 1 insertion(+) 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 c0b3162..b71d6ac 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 @@ -26,6 +26,7 @@ import java.math.BigDecimal; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO"), From 28da49aa29e4cf8d062d5cc70e9620d449d72d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 3 Dec 2020 15:59:15 +0800 Subject: [PATCH 200/329] =?UTF-8?q?=E3=80=9012422=2019048=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=96=B7=E6=B6=82=E6=8A=9B=E5=85=89=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=2020201112=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/mes/bean/MesDefectRecord.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 34acd47..cb04f19 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -132,12 +132,13 @@ public class MesDefectRecord extends BaseBean implements Serializable { } public MesDefectRecord(String partNo, String workOrderNo, String partName, String workCenterCode, - String workCellCode, String modifyUser, String modifyDatetime) { + String workCellCode, String serialNumber, String modifyUser, String modifyDatetime) { this.partNo = partNo; this.workOrderNo = workOrderNo; this.partName = partName; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; + this.serialNumber = serialNumber; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; } From d64a8fd31c26b8b9e3a7510a12cbc7d450fe3720 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 17:11:42 +0800 Subject: [PATCH 201/329] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesStepParam.java | 4 +++ 2 files changed, 39 insertions(+) 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 98ad82a..363e667 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 @@ -3126,6 +3126,41 @@ public class MesEnumUtil { } /** + * 工步参数 是否必填 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STEP_PARAM_IS_NEED { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + MES_STEP_PARAM_IS_NEED(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * mes工作单元参数类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index cd1bd7f..99c4596 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -65,6 +65,10 @@ public class MesStepParam extends BaseBean implements Serializable { @ApiParam("参数对象") private String objectCode; + @Column(name = "IS_NEED") + @ApiParam("是否必填") + private Integer isNeed = 1; + @Column(name = "TYPE") @ApiParam("type") private Integer type = 0; From 2b522ca15de14e354e0574c8cbb9e45871afcc74 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 17:14:21 +0800 Subject: [PATCH 202/329] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=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/MesStepParam.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/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index 99c4596..1a6f5b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -66,7 +66,7 @@ public class MesStepParam extends BaseBean implements Serializable { private String objectCode; @Column(name = "IS_NEED") - @ApiParam("是否必填") + @ApiParam("是否必需") private Integer isNeed = 1; @Column(name = "TYPE") From 14c47545e78fa571b0ccf216c005f0f27e8255e4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 3 Dec 2020 20:10:43 +0800 Subject: [PATCH 203/329] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java index 1c05c3c..6aaf4fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java @@ -11,7 +11,7 @@ import lombok.Data; @Data public class SparePartStockModel { - private Integer maxQty; + private String maxQty; - private Integer minQty; + private String minQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index bcde4c8..ee666a5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3327,9 +3327,9 @@ public class MesHqlPack { if (queueJitPlan.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean); } - if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(queueJitPlan.getPlanStartDate()) || !StringUtils.isEmpty(queueJitPlan.getPlanEndDate())) { + DdlPreparedPack.timeBuilder(queueJitPlan.getPlanStartDate(), queueJitPlan.getPlanEndDate(), + "planDate", packBean, true); } if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), From 56989acba2646c9a8338b0262f3171b5c1dda626 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Thu, 3 Dec 2020 21:00:02 +0800 Subject: [PATCH 204/329] =?UTF-8?q?12362=2020027-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF-=E9=A6=96=E6=A3=80=E6=A3=80=E9=AA=8C=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=8A=A5=E8=A1=A8=E7=8A=B6=E6=80=81=E5=B7=B2=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=9A=84=E5=AF=B9=E5=BA=94=E7=9A=84=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E5=B7=B2=E6=A3=80=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98-20201115?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index ed50194..20ac65a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -145,4 +145,15 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("本批次生产总数") private Double locSrcLotNoQty; + @Transient + @ApiParam("客户名称") + private String customerName; + + @Transient + @ApiParam("班次") + private String shiftName; + + @Transient + @ApiParam("班长") + private String squadLeader; } From 8dcb1703c91ce885e752268da9c0ac867228b88b Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 4 Dec 2020 11:29:31 +0800 Subject: [PATCH 205/329] =?UTF-8?q?=E9=A6=96=E6=A3=80=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.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/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 03c2cd2..e808b1b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -125,7 +125,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Transient @ApiParam("检测值") - private String checkValue; + private String checkValue = ""; @Transient @ApiParam("质检单检测记录id") From b5c994a18ba14b14cad04a08e7d92119d1f8b3bf Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 6 Dec 2020 21:20:36 +0800 Subject: [PATCH 206/329] =?UTF-8?q?sweb=E5=90=8C=E4=B8=80=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=BC=96=E7=A0=81=E5=91=BD=E5=90=8D=E4=B8=BA?= =?UTF-8?q?VendorNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/sweb/bean/SwebDocMovementDetails.java | 4 +- .../pojo/sweb/bean/SwebDocMovementMaster.java | 4 +- .../i3plus/pojo/sweb/bean/SwebDocMovementSn.java | 4 -- .../pojo/sweb/bean/SwebProcurementPlanOrder.java | 4 +- .../i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 4 +- .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 4 +- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 4 +- .../i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 4 +- .../i3plus/pojo/sweb/bean/SwebVendorAlarm.java | 4 +- .../estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java | 4 +- .../i3plus/pojo/sweb/bean/SwebVendorStock.java | 4 +- .../pojo/sweb/bean/SwebVendorSupplierCapcity.java | 4 +- .../i3plus/pojo/sweb/bean/WmsMovementToSweb.java | 48 --------------- .../modelbean/SwebPOBatchInsertEnterModel.java | 2 +- .../modelbean/SwebPOBatchInsertItemEnterModel.java | 2 +- .../modelbean/SwebPODetailsUpdateHistoryModel.java | 2 +- .../sweb/modelbean/SwebPOForPubListEnterModel.java | 2 +- .../modelbean/SwebPOForPubListResultItemModel.java | 4 +- .../repository/WmsMovementToSwebRepository.java | 9 --- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 68 ++++++++++------------ .../pojo/wms/bean/SwebProcurementPlanOrder.java | 4 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 22 files changed, 63 insertions(+), 128 deletions(-) delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java index 187829f..3e369ee 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java @@ -32,8 +32,8 @@ public class SwebDocMovementDetails extends BaseBean { private static final long serialVersionUID = -1232334350341792942L; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java index 56aaa79..4a66228 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java @@ -92,8 +92,8 @@ public class SwebDocMovementMaster extends BaseBean { private String refNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java index 1dcc1c6..72140ab 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java @@ -75,10 +75,6 @@ public class SwebDocMovementSn extends BaseBean { @ApiParam(value = "条码类型") private Integer snType; - @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; - @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") private String vendorName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java index e627eee..7b0b55b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java @@ -42,8 +42,8 @@ public class SwebProcurementPlanOrder extends BaseBean { private Integer orderStatus; @ApiParam("供应商代码") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 329db54..887b7ea 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -37,8 +37,8 @@ public class SwebPurchaseOrder extends BaseBean { public String orderNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index cbe1519..79d8e38 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -36,8 +36,8 @@ public class SwebPurchaseOrderDetails extends BaseBean { private String orderNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 0b95c97..628c218 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -36,8 +36,8 @@ public class SwebPurchaseOrderSn extends BaseBean { private String orderNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java index 5807d18..3b26310 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -37,9 +37,9 @@ public class SwebRequireAlarm extends BaseBean { @ApiParam("物料名称") private String partName; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam("供应商代码") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java index b8acd2d..fc98a68 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java @@ -35,9 +35,9 @@ public class SwebVendorAlarm extends BaseBean { @ApiParam("物料名称") private String partName; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam("供应商代码") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java index d4afe0c..446612c 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java @@ -38,6 +38,6 @@ public class SwebVendorRel extends BaseBean { private String vendorName; @ApiParam("供应商代码") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java index 4d7e3b7..106d1ee 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java @@ -37,9 +37,9 @@ public class SwebVendorStock extends BaseBean { @ApiParam("物料名称") private String partName; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam("供应商代码") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java index f0f2d7e..9361a39 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java @@ -30,9 +30,9 @@ import javax.persistence.Transient; public class SwebVendorSupplierCapcity extends BaseBean { private static final long serialVersionUID = 2327910806789997252L; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam("供应商代码") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java deleted file mode 100644 index 0733e25..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.bean; - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_MOVEMENT_TO_SWEB") -@Api("库存移动单处理成功后的记录") -public class WmsMovementToSweb extends BaseBean { - private static final long serialVersionUID = 49215041475324487L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java index bad9575..890ff90 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java @@ -23,7 +23,7 @@ public class SwebPOBatchInsertEnterModel extends BaseBean { private String orderNo; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam("供应商名称") private String vendorName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java index 03b46e7..604e860 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java @@ -24,7 +24,7 @@ public class SwebPOBatchInsertItemEnterModel implements Serializable { private String partName; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam("供应商名称") private String vendorName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java index e0e7a1f..a6b71a5 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java @@ -21,7 +21,7 @@ public class SwebPODetailsUpdateHistoryModel extends BaseBean { private String orderNo; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam(value = "零件号") private String partNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java index 0f47fc7..46dda5b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java @@ -19,7 +19,7 @@ public class SwebPOForPubListEnterModel extends BaseBean { private String orderNo; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam(value = "订单类型", example = "1") public Integer orderType; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java index d8e7886..ac0d652 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java @@ -28,8 +28,8 @@ public class SwebPOForPubListResultItemModel extends BaseBean { private String partNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java deleted file mode 100644 index 83a31be..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.WmsMovementToSweb; -import org.springframework.stereotype.Repository; - -@Repository -public interface WmsMovementToSwebRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 6575cee..c9f9ddf 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -52,7 +52,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); - DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); @@ -67,10 +67,10 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); - if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) { - DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); + if (StringUtil.isEmpty(purchaseOrder.getVendorNo())) { + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } else { - DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorNo(), "vendorNo", result); } if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), @@ -113,7 +113,7 @@ public class SwebHqlPack { HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result); HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + HqlPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result); HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result); HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result); // 封装有效状态和删除状态 @@ -127,7 +127,7 @@ public class SwebHqlPack { public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result); DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); // 封装有效状态和删除状态 @@ -139,7 +139,7 @@ public class SwebHqlPack { public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrder, result); @@ -156,7 +156,7 @@ public class SwebHqlPack { public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(vendorRel.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(vendorRel, result); @@ -165,19 +165,17 @@ public class SwebHqlPack { public static DdlPackBean getPurchaseOrderDetailsPublishListQtyWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); - //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); - //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } @@ -189,9 +187,7 @@ public class SwebHqlPack { public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); - //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); -// DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); return buildHql(details, result); } @@ -212,17 +208,17 @@ public class SwebHqlPack { DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(details.getVendorNo(), "vendorNo", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(details, result); } - public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List vendorCodes) { + public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List vendorNos) { DdlPackBean result = new DdlPackBean(); - if (vendorCodes.size() == 1) { - DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); - } else if (vendorCodes.size() > 1){ - DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result); @@ -236,12 +232,12 @@ public class SwebHqlPack { return buildHql(capcity, result); } - public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List vendorCodes) { + public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List vendorNos) { DdlPackBean result = new DdlPackBean(); - if (vendorCodes.size() == 1) { - DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); - } else if (vendorCodes.size() > 1){ - DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); if (!StringUtil.isEmpty(alarm.getDateStart())) { @@ -254,24 +250,24 @@ public class SwebHqlPack { return buildHql(alarm, result); } - public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List vendorCodes) { + public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List vendorNos) { DdlPackBean result = new DdlPackBean(); - if (vendorCodes.size() == 1) { - DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); - } else if (vendorCodes.size() > 1){ - DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(stock, result); } - public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List vendorCodes) { + public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List vendorNos) { DdlPackBean result = new DdlPackBean(); - if (vendorCodes.size() == 1) { - DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); - } else if (vendorCodes.size() > 1){ - DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index dff1e11..bf2c50b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -41,12 +41,12 @@ public class SwebProcurementPlanOrder extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam(value = "供应商名称") 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 c5215d6..e99fb40 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 @@ -176,7 +176,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); - DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); From ffbc5d605e32e503030b434198534f325d21e71f Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 6 Dec 2020 21:24:58 +0800 Subject: [PATCH 207/329] =?UTF-8?q?=E5=96=9C=E5=BE=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B0=86PO=E5=8F=8AASN=E8=AE=A2=E5=8D=95=E7=9A=84=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E5=B7=B2=E6=89=93=E5=8D=B0=E7=9A=84JOB?= 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, 2 insertions(+), 2 deletions(-) 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 1d45817..8eb49bb 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 @@ -337,10 +337,10 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String remark, Integer item,String partNo,String partNameRdd, Double qty, + public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; - this.remark = remark; + this.erpSrcNo = erpSrcNo; this.item = item; this.partNo = partNo; this.partNameRdd = partNameRdd; From a62b10dc9d050af1798b9c975a600e9c99e77158 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 7 Dec 2020 09:38:19 +0800 Subject: [PATCH 208/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index bf2c50b..dff1e11 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -41,12 +41,12 @@ public class SwebProcurementPlanOrder extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; - @Column(name = "VENDOR_NO") + @Column(name = "VENDOR_CODE") @ApiParam(value = "供应商代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") - private String vendorNo; + private String vendorCode; @Column(name = "VENDOR_NAME") @ApiParam(value = "供应商名称") 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 e99fb40..f10ed68 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 @@ -176,7 +176,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); - DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); From f744b94e87cec428c4cf5bf3a490d0b6b022a865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=A2=81=E4=B8=8D=E8=83=96?= <1773091595@qq.com> Date: Mon, 7 Dec 2020 10:11:57 +0800 Subject: [PATCH 209/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=A2=86=E6=96=99?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 15 +++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 29 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java | 4 +-- 3 files changed, 46 insertions(+), 2 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 cb532b0..37065db 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 @@ -474,6 +474,8 @@ public class WmsDocMovementDetails extends BaseBean { String prodCfgTypeName; + + public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) { this.custNo = custNo; this.orderNo = orderNo; @@ -715,4 +717,17 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } + public WmsDocMovementDetails(String orderNo,String custPartNo,String srcZoneNo, String destZoneNo,String destLocateNo,Double qty,Double pickQty, String createDatetime,Integer orderStatus,String createUser) { + this.orderNo = orderNo; + this.custPartNo = custPartNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.qty = qty; + this.pickQty = pickQty; + this.createDatetime = createDatetime; + this.orderStatus = orderStatus; + this.createUser = createUser; + + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 787c2a1..214993b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -358,6 +358,23 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("查询状态集合") public List orderStatusList; + @Transient + @ApiParam("一个应拣数里面的料子") + public Double snp; + + @Transient + @ApiParam("实拣数") + public int pickQty; + + + @Transient + @ApiParam("拣货状态") + public Integer pickOrderStatus; + + @Transient + @ApiParam("完成时间") + public String complateDatetime; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -401,4 +418,16 @@ public class WmsDocMovementMaster extends BaseBean { this.custOwner = custOwner; this.custTel = custTel; } + + public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Double snp,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { + this.orderNo = orderNo; + this.createDatetime = createDatetime; + this.qty = qty; + this.snp = snp; + this.orderStatus = orderStatus; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.assignPlanDate = planDate; + this.assignPlanTime = planTime; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java index c8fa3f5..bb4ab7b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java @@ -33,8 +33,8 @@ public class WmsFix extends BaseBean{ @ApiParam("设备编号") public String fixId; - @Column(name = "FIX_MAC") - @ApiParam("设备mac地址") + @Column(name = "FIX_MAC") @ApiParam("设备mac地址") + public String fixMac; @Column(name = "FIX_NAME") From 5c1164a9381e51714f6ed8293876de5dad223d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 7 Dec 2020 11:00:04 +0800 Subject: [PATCH 210/329] =?UTF-8?q?=E5=A2=A8=E8=A5=BF=E5=93=A5WMS=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E4=B8=9A=E5=8A=A1=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E9=80=9A=E7=94=A8=E8=84=9A=E6=9C=AC=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3+=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=ACDAO?= =?UTF-8?q?=E5=B1=82+=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E8=AE=A1=E5=88=92=E7=8A=B6=E6=80=81FINISH(25,=20"FINI?= =?UTF-8?q?SH",=20"=E5=B7=B2=E5=AE=8C=E6=88=90")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + .../wms/repository/WmsProductVersionRepository.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java 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 14d440e..e844a72 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 @@ -5096,6 +5096,7 @@ public class WmsEnumUtil { public enum WORK_ORDER_PLAN_STATUS { CREATE(10, "CREATE", "创建"), PLANNED(20, "PLANNED", "处理中"), + FINISH(25, "FINISH", "已完成"), CLOSE(30, "CLOSE", "已关闭"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java new file mode 100644 index 0000000..dc6b275 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsProductVersion; +import org.springframework.stereotype.Repository; + +/** + * @Description 生产版本DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/12/4 18:49 + * @Modify + */ +@Repository +public interface WmsProductVersionRepository extends BaseRepository { +} From da293141cd31b8dac511201d23a0c63fab1a1ba8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 7 Dec 2020 15:08:31 +0800 Subject: [PATCH 211/329] =?UTF-8?q?oee=20bug=E4=BF=AE=E5=A4=8D?= 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 | 1 + .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 4 ++++ 2 files changed, 5 insertions(+) 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 363e667..fbe4029 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 @@ -5619,6 +5619,7 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VALUE_TYPE { + MANUAL_ASSIGNMENT("10", "手工赋值"), SPEL_EXPRESSION("20", "spel表达式"), FUNCTION_ASSIGNMENT("30", "函数赋值"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index bd5d000..9d9e191 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -144,4 +144,8 @@ public class MesOee extends BaseBean implements Serializable { @Transient @ApiParam("手工录入集合") private List attributes; + + @Transient + @ApiParam("自定义数据-非手工录入") + private String busiDataNoManual; } From f9ce9641de63984b19b64f6459b62254ef7d1f21 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 7 Dec 2020 17:37:53 +0800 Subject: [PATCH 212/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index ad0869f..f35d6ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Index(columnList = "WORK_ORDER_NO"), @Index(columnList = "WORK_CENTER_CODE"), @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "IS_SEALED") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) 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 b71d6ac..c8226c2 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 @@ -29,6 +29,7 @@ import java.math.BigDecimal; @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME"), @Index(columnList = "PART_NO"), @Index(columnList = "WORK_ORDER_NO") }, uniqueConstraints = { From d2fd06cb2bb965986f509d5ada1cad8ae97fb4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 7 Dec 2020 18:18:57 +0800 Subject: [PATCH 213/329] =?UTF-8?q?fix(core):=E5=8D=95=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=A7=84=E5=88=99=E6=B2=A1=E6=9C=89=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index ed8ce43..1634410 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -63,13 +63,13 @@ public class SysOrderNoRule extends BaseBean { private Long serialNoLength; @Column(name = "IS_CYCLE") - @ApiParam(value = "达到最大值后是否循环",example = "1") + @ApiParam(value = "是否按日期循环", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isCycle; @Column(name = "IS_FIXED_LENGTH") @ColumnDefault("2") - @ApiParam(value = "是否固定序号长度长度",example = "1") + @ApiParam(value = "是否固定序号长度",example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isFixedLength; From ae9978a3bb3088d234cc25751255b07d35ac1937 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 7 Dec 2020 19:24:21 +0800 Subject: [PATCH 214/329] =?UTF-8?q?=E6=96=B0=E5=A2=9EserialNumber=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java index 170de7d..f470ffb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java @@ -30,10 +30,12 @@ public class QcOrderCheckDataDetailModel { private Integer checkResult; + private String serialNumber; + public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount, Integer isConcession, Integer isKeyCheckItem, Double max, Double min, - String checkValue, Integer checkResult) { + String checkValue, Integer checkResult, String serialNumber) { this.checkType = checkType; this.checkItem = checkItem; this.checkStandard = checkStandard; @@ -44,5 +46,6 @@ public class QcOrderCheckDataDetailModel { this.min = min; this.checkValue = checkValue; this.checkResult = checkResult; + this.serialNumber = serialNumber; } } From 0923584955825bb7689370473e226fb7f53d8cd0 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Dec 2020 20:53:05 +0800 Subject: [PATCH 215/329] =?UTF-8?q?Sweb=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 125 ++++++++++++++++++++- .../pojo/sweb/bean/SwebDocMovementDetails.java | 7 +- .../i3plus/pojo/sweb/bean/SwebDocMovementSn.java | 2 +- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 5 + .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 6 +- 5 files changed, 135 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index a130b9b..fca896c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class SwebEnumUtil { /** - * 单据主表状态(ASN,PO,MOVE,QC) + * 采购单据主表状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_MASTER_STATUS { @@ -142,8 +142,7 @@ public class SwebEnumUtil { public enum ORDER_SN_STATUS { CREATE(10, "N", "创建"), RECEIPTED(20, "R", "已完成"), - CANCEL(30, "C", "行取消"), - PRINTED(40, "C", "已打印"); + CANCEL(30, "C", "行取消"); private int value; private String code; @@ -189,6 +188,126 @@ public class SwebEnumUtil { } /** + * 委外单据主表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVEMENT_MASTER_STATUS { + CREATE(10, "CREATE", "新建"), + PRINTED(20, "PRINTED", "已打印"), + DELIVERY(30, "DELIVERY", "已发货"); + + private int value; + private String code; + private String description; + + MOVEMENT_MASTER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 委外订单明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVEMENT_DETAILS_STATUS { + CREATE(10, "CREATE", "新建"), + PRINTED(20, "PRINTED", "已打印"), + DELIVERY(30, "DELIVERY", "已发货"); + + private int value; + private String code; + private String description; + + MOVEMENT_DETAILS_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * PO订单来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java index 3e369ee..732fbfb 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -69,7 +70,7 @@ public class SwebDocMovementDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public String item; + public Integer item; @Column(name = "SNP") @ApiParam(value = "标准包装", example = "1") @@ -157,8 +158,8 @@ public class SwebDocMovementDetails extends BaseBean { public transient Integer lockVersion; @Column(name = "IS_SN") - @ApiParam(value = "条码生成状态", example = "20") - public Integer isSn; + @ApiParam(value = "条码生成状态", example = "2") + public Integer isSn = CommonEnumUtil.FALSE; @Column(name = "LOT_NO") @ApiParam("批次") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java index 72140ab..2a28152 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java @@ -36,7 +36,7 @@ public class SwebDocMovementSn extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public String item; + public Integer item; @Column(name="PART_NO") @ApiParam("物料编码") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 628c218..0844d3f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -51,6 +51,11 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "零件名称") private String partName; + @Column(name = "ITEM_NO") + @ColumnDefault("0") + @ApiParam(value = "行号", example = "0") + private Integer itemNo; + @ApiParam("零件类型") @Column(name = "PART_TYPE") private Integer partType; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index c9f9ddf..8028951 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -205,10 +205,10 @@ public class SwebHqlPack { public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringLikerPack(details.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(details, result); } From e5c74320930584c95bddb17d4797e3c23e49a5a7 Mon Sep 17 00:00:00 2001 From: liangyao Date: Tue, 8 Dec 2020 14:43:10 +0800 Subject: [PATCH 216/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 214993b..088b222 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -419,11 +419,10 @@ public class WmsDocMovementMaster extends BaseBean { this.custTel = custTel; } - public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Double snp,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { + public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { this.orderNo = orderNo; this.createDatetime = createDatetime; this.qty = qty; - this.snp = snp; this.orderStatus = orderStatus; this.organizeCode = organizeCode; this.createUser = createUser; From 4cfee2dc9cf8e0f9047aea6f5b8f1294d7d9a9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 8 Dec 2020 14:53:15 +0800 Subject: [PATCH 217/329] =?UTF-8?q?=E3=80=9012591=2020027-BI-=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BB=8F=E7=90=86BI=E6=8A=A5=E8=A1=A8-=E8=B0=83?= =?UTF-8?q?=E8=A7=92=E5=99=A8=E5=B7=A5=E5=8E=82=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E4=BA=A7=E5=87=BA=E6=83=85=E5=86=B5-=E6=B5=AE=E7=AA=97?= =?UTF-8?q?=E8=A7=A3=E9=87=8A=E4=B8=8D=E6=B8=85=E6=99=B0-2020-12-04?= =?UTF-8?q?=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/mes/bean/MesWorkOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 4308bde..5ac72a7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -424,6 +424,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("模具编号集合") private String mouldCodeList; + @Transient + @ApiParam("不良数量") + private Integer ngQty; + From d176895a5d2d6b0cbce6610c366be15801f0c3a5 Mon Sep 17 00:00:00 2001 From: liangyao Date: Tue, 8 Dec 2020 16:32:54 +0800 Subject: [PATCH 218/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 088b222..6a02dc3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -375,6 +375,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("完成时间") public String complateDatetime; + @Transient + @ApiParam("应拣数") + public Integer inQty; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -419,10 +423,10 @@ public class WmsDocMovementMaster extends BaseBean { this.custTel = custTel; } - public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { + public WmsDocMovementMaster(String orderNo,String createDatetime,Integer inQty,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { this.orderNo = orderNo; this.createDatetime = createDatetime; - this.qty = qty; + this.inQty = inQty; this.orderStatus = orderStatus; this.organizeCode = organizeCode; this.createUser = createUser; From b1e09f09a3df1f367cdbc2f9a1ff6d888e47750b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 8 Dec 2020 18:02:22 +0800 Subject: [PATCH 219/329] =?UTF-8?q?mes=E6=B7=BB=E5=8A=A0stationwebsocket?= =?UTF-8?q?=20=E7=9A=84busiType=E7=B1=BB=E5=9E=8B=20=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 bb8bf78..ac04bbd 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 @@ -2681,7 +2681,8 @@ public class MesPcnEnumUtil { ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"), ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"), TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), - MESSAGE_POOL("messagePool", "消息池"); + MESSAGE_POOL("messagePool", "消息池"), + FORCE_LOGOUT("forceLogout", "websocket强制下线"); private String value; private String description; @@ -6009,6 +6010,7 @@ public class MesPcnEnumUtil { } return null; } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { From 4676a84b0788bec9b03a7768a5301a9a74594d68 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 8 Dec 2020 18:08:45 +0800 Subject: [PATCH 220/329] =?UTF-8?q?=E5=88=A0=E9=99=A4mes-pcn=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=BC=95=E5=85=A5=E7=B1=BB=E4=BB=A5?= =?UTF-8?q?mes=E5=8C=85=E4=B8=BA=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 55 --- .../pojo/mes/pcn/bean/IfDismantleRecord.java | 105 ------ .../i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 100 ----- .../i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 88 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesAction.java | 48 --- .../i3plus/pojo/mes/pcn/bean/MesActionIf.java | 40 -- .../i3plus/pojo/mes/pcn/bean/MesActionMethod.java | 49 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 59 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java | 90 ----- .../i3plus/pojo/mes/pcn/bean/MesCachaQueue.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesCellFeed.java | 79 ---- .../pojo/mes/pcn/bean/MesCellFeedRecord.java | 74 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesCustProdLine.java | 40 -- .../i3plus/pojo/mes/pcn/bean/MesCustomer.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesCustomerPart.java | 49 --- .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 71 ---- .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 82 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 81 ---- .../i3plus/pojo/mes/pcn/bean/MesDefectCause.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 80 ---- .../pojo/mes/pcn/bean/MesDismantleRecord.java | 97 ----- .../pojo/mes/pcn/bean/MesEquAlarmRecord.java | 53 --- .../i3plus/pojo/mes/pcn/bean/MesEquipment.java | 97 ----- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java | 93 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java | 52 --- .../i3plus/pojo/mes/pcn/bean/MesEventAction.java | 54 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java | 47 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java | 59 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java | 65 ---- .../i3plus/pojo/mes/pcn/bean/MesKpsnRule.java | 95 ----- .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 54 --- .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 55 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java | 55 --- .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 52 --- .../pojo/mes/pcn/bean/MesMonitorTaskDetail.java | 48 --- .../i3plus/pojo/mes/pcn/bean/MesNumberRule.java | 60 --- .../pojo/mes/pcn/bean/MesNumberSerialno.java | 49 --- .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 60 --- .../i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 62 ---- .../i3plus/pojo/mes/pcn/bean/MesPackSpec.java | 99 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 119 ------ .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 63 ---- .../i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 58 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 93 ----- .../i3plus/pojo/mes/pcn/bean/MesPartCategory.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesPartFormula.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 68 ---- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 87 ----- .../i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java | 55 --- .../i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java | 92 ----- .../pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 54 --- .../pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 70 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 90 ----- .../i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java | 53 --- .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 144 ------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 112 ------ .../estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java | 39 -- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 106 ------ .../estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java | 53 --- .../i3plus/pojo/mes/pcn/bean/MesProdPack.java | 69 ---- .../i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 45 --- .../pojo/mes/pcn/bean/MesProdRouteOptParam.java | 71 ---- .../pojo/mes/pcn/bean/MesProdScatterCfgBom.java | 55 --- .../pojo/mes/pcn/bean/MesProduceCategory.java | 40 -- .../pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 205 ---------- .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 154 -------- .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 109 ------ .../pojo/mes/pcn/bean/MesProductEncodeCfg.java | 50 --- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 107 ------ .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 108 ------ .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 71 ---- .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 62 ---- .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 90 ----- .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 103 ----- .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 78 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 102 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 51 --- .../i3plus/pojo/mes/pcn/bean/MesRouteProcess.java | 64 ---- .../pojo/mes/pcn/bean/MesRouteProcessCell.java | 44 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 71 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 68 ---- .../i3plus/pojo/mes/pcn/bean/MesShiftGroup.java | 47 --- .../i3plus/pojo/mes/pcn/bean/MesShiftRest.java | 49 --- .../pojo/mes/pcn/bean/MesSnPhotoRelation.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesStationBom.java | 151 -------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java | 102 ----- .../i3plus/pojo/mes/pcn/bean/MesStepParam.java | 47 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java | 40 -- .../i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 97 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java | 48 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 83 ----- .../i3plus/pojo/mes/pcn/bean/MesWcEquipment.java | 43 --- .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 64 ---- .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 64 ---- .../i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java | 48 --- .../pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java | 56 --- .../pojo/mes/pcn/bean/MesWorkCellStatus.java | 47 --- .../i3plus/pojo/mes/pcn/bean/MesWorkCenter.java | 57 --- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 249 ------------- .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 231 ------------ .../pojo/mes/pcn/model/ActionRequestBean.java | 38 -- .../estsh/i3plus/pojo/mes/pcn/model/AttrBean.java | 17 - .../i3plus/pojo/mes/pcn/model/ButtonBean.java | 22 -- .../pojo/mes/pcn/model/DataAcquisitionModel.java | 35 -- .../i3plus/pojo/mes/pcn/model/DefectModel.java | 50 --- .../i3plus/pojo/mes/pcn/model/EsopFileModel.java | 26 -- .../pojo/mes/pcn/model/FastDfsDownloadModel.java | 31 -- .../pojo/mes/pcn/model/GenSerialNoModel.java | 72 ---- .../pojo/mes/pcn/model/MesButtonFlagModel.java | 57 --- .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 35 -- .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 126 ------- .../pojo/mes/pcn/model/MesStationBomModel.java | 75 ---- .../pojo/mes/pcn/model/PLCInteracticeModel.java | 50 --- .../pojo/mes/pcn/model/PcsObserverStatusModel.java | 25 -- .../pojo/mes/pcn/model/ProdPackageModel.java | 78 ---- .../pojo/mes/pcn/model/ProductDataModel.java | 24 -- .../pojo/mes/pcn/model/QcCheckStandardModel.java | 25 -- .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 90 ----- .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 83 ----- .../i3plus/pojo/mes/pcn/model/RequestModel.java | 155 -------- .../pojo/mes/pcn/model/SnPrintDataModel.java | 27 -- .../i3plus/pojo/mes/pcn/model/SnPrintModel.java | 27 -- .../i3plus/pojo/mes/pcn/model/StationBomModel.java | 29 -- .../pojo/mes/pcn/model/StationResultBean.java | 55 --- .../i3plus/pojo/mes/pcn/model/StepParamsModel.java | 29 -- .../pojo/mes/pcn/model/StepPrintSnModel.java | 79 ---- .../i3plus/pojo/mes/pcn/model/StepResult.java | 69 ---- .../i3plus/pojo/mes/pcn/model/TorqueModel.java | 71 ---- .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 63 ---- .../repository/IfDismantleRecordRepository.java | 14 - .../pcn/repository/IfPackageDetailRepository.java | 14 - .../pcn/repository/IfProductOffLineRepository.java | 14 - .../mes/pcn/repository/MesActionIfRepository.java | 14 - .../pcn/repository/MesActionMethodRepository.java | 16 - .../mes/pcn/repository/MesActionRepository.java | 17 - .../pojo/mes/pcn/repository/MesAreaRepository.java | 16 - .../pojo/mes/pcn/repository/MesBomRepository.java | 16 - .../repository/MesCellFeedRecordRepository.java | 14 - .../mes/pcn/repository/MesCellFeedRepository.java | 14 - .../mes/pcn/repository/MesConfigRepository.java | 17 - .../pcn/repository/MesCustProdLineRepository.java | 16 - .../pcn/repository/MesCustomerPartRepository.java | 17 - .../mes/pcn/repository/MesCustomerRepository.java | 17 - .../pcn/repository/MesDataObjectRepository.java | 13 - .../pcn/repository/MesDatasourceRepository.java | 13 - .../pcn/repository/MesDefectCauseRepository.java | 14 - .../pcn/repository/MesDefectRecordRepository.java | 14 - .../mes/pcn/repository/MesDefectRepository.java | 14 - .../repository/MesDismantleRecordRepository.java | 14 - .../mes/pcn/repository/MesEquipmentRepository.java | 16 - .../pojo/mes/pcn/repository/MesEsopRepository.java | 17 - .../pcn/repository/MesEventActionRepository.java | 17 - .../mes/pcn/repository/MesEventRepository.java | 17 - .../mes/pcn/repository/MesFiCfgRepository.java | 17 - .../pojo/mes/pcn/repository/MesFileRepository.java | 16 - .../mes/pcn/repository/MesKpDataRepository.java | 17 - .../mes/pcn/repository/MesKpsnRuleRepository.java | 16 - .../MesLabelTemplateParamRepository.java | 14 - .../pcn/repository/MesLabelTemplateRepository.java | 14 - .../mes/pcn/repository/MesMethodRepository.java | 17 - .../repository/MesMonitorTaskDetailRepository.java | 15 - .../pcn/repository/MesMonitorTaskRepository.java | 15 - .../pcn/repository/MesNumberRuleRepository.java | 15 - .../repository/MesNumberSerialnoRepository.java | 16 - .../mes/pcn/repository/MesObjectCfgRepository.java | 13 - .../pcn/repository/MesPLCConfigureRepository.java | 16 - .../mes/pcn/repository/MesPackSpecRepository.java | 16 - .../pcn/repository/MesPackageDetailRepository.java | 13 - .../mes/pcn/repository/MesPackageRepository.java | 13 - .../pcn/repository/MesPackageTravelRepository.java | 13 - .../pcn/repository/MesPartCategoryRepository.java | 16 - .../pojo/mes/pcn/repository/MesPartRepository.java | 16 - .../pcn/repository/MesPatternJisRepository.java | 16 - .../pcn/repository/MesPcnConnectLogRepository.java | 16 - .../pojo/mes/pcn/repository/MesPcnRepository.java | 16 - .../pcn/repository/MesPcnSyncCfgRepository.java | 16 - .../repository/MesPcnSyncErrorLogRepository.java | 16 - .../repository/MesPcnSysUserOfflineRepository.java | 16 - .../pcn/repository/MesPcnTaskLogRepository.java | 16 - .../mes/pcn/repository/MesPcnTaskRepository.java | 16 - .../mes/pcn/repository/MesPlanOrderRepository.java | 16 - .../pojo/mes/pcn/repository/MesPlcRepository.java | 15 - .../mes/pcn/repository/MesProcessRepository.java | 16 - .../repository/MesProdBindRecordRepository.java | 16 - .../pcn/repository/MesProdCfgDetailRepository.java | 16 - .../mes/pcn/repository/MesProdCfgRepository.java | 16 - .../mes/pcn/repository/MesProdPackRepository.java | 16 - .../pcn/repository/MesProdRouteCfgRepository.java | 16 - .../repository/MesProdRouteOptParamRepository.java | 16 - .../repository/MesProdScatterCfgBomRepository.java | 16 - .../repository/MesProduceCategoryRepository.java | 16 - .../MesProduceCtgyPictureRepository.java | 14 - .../mes/pcn/repository/MesProduceSnRepository.java | 16 - .../repository/MesProduceSnTravelRepository.java | 17 - .../pcn/repository/MesProductDataRepository.java | 16 - .../repository/MesProductEncodeCfgRepository.java | 16 - .../pcn/repository/MesQcCheckDataRepository.java | 14 - .../repository/MesQcCheckStandardRepository.java | 14 - .../repository/MesQueueJisDetailRepository.java | 16 - .../mes/pcn/repository/MesQueueJisRepository.java | 16 - .../repository/MesQueueOrderDetailRepository.java | 16 - .../pcn/repository/MesQueueOrderRepository.java | 16 - .../mes/pcn/repository/MesRawPartSnRepository.java | 15 - .../pcn/repository/MesRepairRecordRepository.java | 14 - .../mes/pcn/repository/MesRepairRepository.java | 16 - .../repository/MesRouteProcessCellRepository.java | 16 - .../pcn/repository/MesRouteProcessRepository.java | 16 - .../mes/pcn/repository/MesRouteRepository.java | 16 - .../pcn/repository/MesScrapRecordRepository.java | 14 - .../mes/pcn/repository/MesScrapRepository.java | 16 - .../pcn/repository/MesShiftGroupRepository.java | 16 - .../mes/pcn/repository/MesShiftRepository.java | 17 - .../mes/pcn/repository/MesShiftRestRepository.java | 16 - .../pcn/repository/MesStationBomRepository.java | 16 - .../mes/pcn/repository/MesStepParamRepository.java | 16 - .../pojo/mes/pcn/repository/MesStepRepository.java | 16 - .../pojo/mes/pcn/repository/MesTimeRepository.java | 10 - .../pcn/repository/MesTorqueDetailRepository.java | 17 - .../mes/pcn/repository/MesTypeCfgRepository.java | 14 - .../pcn/repository/MesWcCheckRecordRepository.java | 13 - .../mes/pcn/repository/MesWcCheckRepository.java | 13 - .../pcn/repository/MesWcEquipmentRepository.java | 13 - .../MesWorkCellMonitorLogRepository.java | 13 - .../repository/MesWorkCellParamCfgRepository.java | 16 - .../pcn/repository/MesWorkCellParamRepository.java | 16 - .../pcn/repository/MesWorkCellPointRepository.java | 17 - .../mes/pcn/repository/MesWorkCellRepository.java | 16 - .../repository/MesWorkCellStatusRepository.java | 16 - .../pcn/repository/MesWorkCenterRepository.java | 16 - .../pcn/repository/MesWorkOrderLogRepository.java | 16 - .../mes/pcn/repository/MesWorkOrderRepository.java | 16 - .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 413 --------------------- 239 files changed, 11373 deletions(-) delete mode 100644 modules/i3plus-pojo-mes-pcn/pom.xml delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml deleted file mode 100644 index bf96e57..0000000 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - i3plus-pojo - i3plus.pojo - 1.0-TEST-SNAPSHOT - ../../pom.xml - - 4.0.0 - - i3plus-pojo-mes-pcn - jar - - - - i3plus.pojo - i3plus-pojo-base - - - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${project.version} - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java deleted file mode 100644 index eb147e3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\14 19:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_DISMENTLE_RECORD") -@Api("物料拆解表") -public class IfDismantleRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -6010207359066736962L; - @Column(name = "DISMANTLE_ID") - @ApiParam("拆解编号") - private String dismantleId; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "PARENT_PART_NO") - @ApiParam("产品物料编码") - private String parentPartNo; - - @Column(name = "PARENT_PART_NAME") - @ApiParam("产品物料名称") - private String parentPartName; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Double qty; - - @Column(name = "DISMANTLE_QTY") - @ApiParam("拆解数") - private BigDecimal dismantleQty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子物料编码") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子物料名称") - private String itemPartName; - - @Column(name = "OK_QTY") - @ApiParam("合格数") - private BigDecimal okQty; - - @Column(name = "MISS_QTY") - @ApiParam("缺失数") - private BigDecimal missQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数") - private BigDecimal scrapQty; - - @Column(name = "LOT_NO") - @ApiParam("批次") - private String lotNo; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java deleted file mode 100644 index 651f8dc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 10:01 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PACKAGE_DETAIL") -@Api("包装明细表") -public class IfPackageDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = -1873101288426218272L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装条码") - private String packageNo; - - @Column(name = "LOT_NO") - @ApiParam("包装批次") - private String lotNo; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编号2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编号3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编号4") - private String packageNo4; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; - - @Column(name = "CT_NO") - @ApiParam("容器编号") - private String ctNo; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java deleted file mode 100644 index 367bb1c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java +++ /dev/null @@ -1,88 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 10:12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PRODUCT_OFF_LINE") -@Api("生产报工表") -public class IfProductOffLine extends BaseBean implements Serializable { - - private static final long serialVersionUID = 200629529131241418L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装条码") - private String packageNo; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "LOT_NO") - @ApiParam("生产批次") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批次") - private String fixLotNo; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java deleted file mode 100644 index ac19407..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION") -@Api("mes系统业务动作") -public class MesAction extends BaseBean implements Serializable { - private static final long serialVersionUID = -6451213228967727835L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "ACTION_NAME") - @ApiParam("动作名称") - private String actionName; - - @Column(name = "ACTION_TYPE") - @ApiParam("动作类型") - private Integer actionType; - - public int getActionTypeVal() { - return this.actionType == null ? 0 : this.actionType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java deleted file mode 100644 index eafb489..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\13 11:47 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_IF") -@Api("动作接口配置") -public class MesActionIf extends BaseBean implements Serializable { - - private static final long serialVersionUID = -5058215339453766620L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java deleted file mode 100644 index b38452f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作方法 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_METHOD") -@Api("系统业务动作方法") -public class MesActionMethod extends BaseBean implements Serializable { - private static final long serialVersionUID = 6249418690993577108L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "METHOD_CODE") - @ApiParam("方法代码") - private String methodCode; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java deleted file mode 100644 index d1910a3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description :生产区域 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_AREA") -@Api("生产区域") -public class MesArea extends BaseBean implements Serializable { - private static final long serialVersionUID = 1047604067591557689L; - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "AREA_NAME") - @ApiParam("区域名称") - private String areaName; - - @Transient - @ApiParam(value = "子集列表") - private List childTreeList; - - @Transient - @ApiParam(value = "名称") - private String name; - - // 默认值 -1 - @Transient - @ApiParam(value = "父节点", access = "父节点", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java deleted file mode 100644 index 7471095..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :BOM清单 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_BOM") -@Api("BOM清单") -public class MesBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -1772273641263268564L; - @Column(name = "PART_NO") - @ApiParam("父零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("父零件名称") - private String partName; - - @Column(name = "UNIT") - @ApiParam(value = "单位") - private String unit; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "数量", example = "0") - private Double qty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子零件") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子零件名称") - private String itemPartName; - - @Column(name = "ITEM_UNIT") - @ApiParam(value = "子零件单位") - private String itemUnit; - - @Column(name = "ITEM_QTY") - @ColumnDefault("0") - @ApiParam(value = "子零件数量", example = "0") - private Double itemQty; - - @Column(name = "BOM_VERSION") - @ApiParam(value = "BOM版本") - private String bomVersion; - - @Column(name = "EFF_START_TIME") - @ApiParam(value = "生效时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String effStartTime; - - @Column(name = "EFF_END_TIME") - @ApiParam(value = "失效时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String effEndTime; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getitemQtyVal() { - return this.itemQty == null ? 0.0d : this.itemQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java deleted file mode 100644 index fd9c366..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/16 0016 - 15:09 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CACHA_QUEUE") -@Api("MES缓存队列") -public class MesCachaQueue extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8272649623030195332L; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "CACHA_TYPE") - @ApiParam("缓存类型") - private String cachaType; - -} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java deleted file mode 100644 index 60e2d1d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; -import java.io.Serializable; - -/** - * @Description :工位投料信息 - * @Reference : - * @Author : Wynne.Lu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CELL_FEED") -@Api("工位投料信息") -public class MesCellFeed extends BaseBean implements Serializable { - private static final long serialVersionUID = 2412657464618960515L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("特殊批次") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public Integer lockVersion; - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java deleted file mode 100644 index 6464445..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java +++ /dev/null @@ -1,74 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工位投料履历信息 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2020-06-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CELL_FEED_RECORD") -@Api("工位投料履历信息") -public class MesCellFeedRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1947971379489107783L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("原材料数量") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java deleted file mode 100644 index f8b9558..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :配置表 - * @Reference : - * @Author : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CONFIG") -@Api("mes配置表") -public class MesConfig extends BaseBean implements Serializable { - private static final long serialVersionUID = -5759669472714287000L; - @Column(name = "CFG_CODE") - @ApiParam("配置代码") - private String cfgCode; - - @Column(name = "CFG_NAME") - @ApiParam("配置名称") - private String cfgName; - - @Column(name = "CFG_TYPE") - @ApiParam("配置类型") - private String cfgType; - - @Column(name = "CFG_KEY") - @ApiParam("配置key") - private String cfgKey; - - @Column(name = "CFG_VALUE") - @ApiParam("配置value") - private String cfgValue; - - @Column(name = "CFG_VAULE_DESC") - @ApiParam("配置value描述") - private String cfgValueDesc; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java deleted file mode 100644 index 8e9a363..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_PROD_LINE") -@Api("客户产线代码") -public class MesCustProdLine extends BaseBean implements Serializable { - private static final long serialVersionUID = 3049432665592161513L; - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "CUST_PROD_LINE_NAME") - @ApiParam("客户产线名称") - private String custProdLineName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java deleted file mode 100644 index 21f2ad1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes客户表 - * @Reference : - * @Author : crish - * @CreateDate : 2019-04-22 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUSTOMER") -@Api("客户信息") -public class MesCustomer extends BaseBean implements Serializable { - private static final long serialVersionUID = 167635887082538926L; - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "CUSTOMER_NAME") - @ApiParam("客户名称") - private String customerName; - - @Column(name = "BRIEF_TEXT") - @ApiParam("客户简称") - private String briefText; - - @Column(name = "ADDRESS") - @ApiParam("客户地址") - private String address; - - @Column(name = "CONTACT") - @ApiParam("客户联系人") - private String contact; - - @Column(name = "TELEPHONE") - @ApiParam("客户电话") - private String telephone; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java deleted file mode 100644 index 0c5f49c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes客户表 - * @Reference : - * @Author : yiming.gu - * @CreateDate : 2019-05-20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUSTOMER_PART") -@Api("客户零件关系") -public class MesCustomerPart extends BaseBean implements Serializable { - private static final long serialVersionUID = -4731252848471949263L; - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUSTOMER_PART_NO") - @ApiParam("客户零件号") - private String customerPartNo; - - @Column(name = "CUSTOMER_PART_NAME") - @ApiParam("客户零件描述") - private String customerPartName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java deleted file mode 100644 index 8bded7d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:12 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DATA_OBJECT") -@Api("数据对象") -public class MesDataObject extends BaseBean implements Serializable { - - private static final long serialVersionUID = -1419262751765770535L; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Column(name = "FIELD_PK") - @ApiParam("主键") - private String fieldPk; - - @Column(name = "READ_FLAG_VALUE") - @ApiParam("读取标志值") - private String readFlagValue; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "SELF_ADDITION") - @ApiParam("自增列") - private String selfAddition; - - @Column(name = "SELF_ADDITION_VALUE") - @ApiParam("自增列值") - private Long selfAdditionValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java deleted file mode 100644 index 93ea185..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:17 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DATASOURCE") -@Api("地址清单") -public class MesDatasource extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7387559860198655900L; - @Column(name = "DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name = "DS_NAME") - @ApiParam("数据源名称") - private String dsName; - - @Column(name = "DS_TYPE") - @ApiParam("数据源类型") - private String dsType; - - @Column(name = "DS_HOST") - @ApiParam("主机") - private String dsHost; - - @Column(name = "DS_PORT") - @ApiParam("端口") - private Integer dsPort; - - @Column(name = "DS_USER") - @ApiParam("用户名") - private String dsUser; - - @Column(name = "DS_PASSWORD") - @ApiParam("密码") - private String dsPassword; - - @Column(name = "DS_DB_NAME") - @ApiParam("数据库名称") - private String dsDbName; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Override - public String toString() { - return "MesDatasource{" + - "dsCode='" + dsCode + '\'' + - ", dsName='" + dsName + '\'' + - ", dsType='" + dsType + '\'' + - ", dsHost='" + dsHost + '\'' + - ", dsPort=" + dsPort + - ", dsUser='" + dsUser + '\'' + - ", dsPassword='" + dsPassword + '\'' + - ", dsDbName='" + dsDbName + '\'' + - ", equipmentCode='" + equipmentCode + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java deleted file mode 100644 index c42d71d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ /dev/null @@ -1,81 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT") -@Api("缺陷表") -public class MesDefect extends BaseBean implements Serializable { - - private static final long serialVersionUID = -6771813937279359333L; - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "DEFECT_TYPE") - @ApiParam("缺陷类型") - private String defectType; - - @Column(name = "PROD_CFG_TYPE_CODE") - @ApiParam("项目代码") - private String prodCfgTypeCode; - - @Column(name = "DEFECT_FLAG_VALUE") - @ApiParam("缺陷标识值") - private String defectFlagValue; - - @Column(name = "DEFECT_ACTION_TYPE") - @ApiParam("不良处理类型") - private String defectActionType; - - @Transient - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @Transient - @ApiParam("缺陷位置") - private String defectLocation; - - @Transient - @ApiParam("缺陷类型子集") - private List mesDefectList; - - public MesDefect() { - - } - - public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) { - this.defectCode = defectCode; - this.defectName = defectName; - this.defectType = defectType; - this.defectTypeName = defectTypeName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java deleted file mode 100644 index d4f287f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_CAUSE") -@Api("缺陷原因表") -public class MesDefectCause extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3867250593038812861L; - @Column(name = "DC_CODE") - @ApiParam("缺陷原因代码") - private String dcCode; - - @Column(name = "DC_NAME") - @ApiParam("缺陷原因名称") - private String dcName; - - @Column(name = "DC_TYPE") - @ApiParam("缺陷原因类型") - private String dcType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java deleted file mode 100644 index a97ccef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 19:53 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("不良信息记录表") -public class MesDefectRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2828208776424343584L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "DEFECT_LOCATION") - @ApiParam("缺陷位置") - private String defectLocation; - - @Column(name = "SIDE_LOCATION") - @ApiParam("面位") - private String sideLocation; - - @Column(name = "REPAIR_STATUS") - @ApiParam("维修状态") - private Integer repairStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Transient - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java deleted file mode 100644 index 14151ff..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.math.BigDecimal; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 15:03 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD", indexes = { - @Index(columnList = "SN"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("物料拆解记录表") -public class MesDismantleRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7924346039878218038L; - @Column(name = "DISMANTLE_ID") - @ApiParam("拆解编号") - private String dismantleId; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "PARENT_PART_NO") - @ApiParam("产品物料编码") - private String parentPartNo; - - @Column(name = "PARENT_PART_NAME") - @ApiParam("产品物料名称") - private String parentPartName; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Double qty; - - @Column(name = "DISMANTLE_QTY") - @ApiParam("拆解数") - private BigDecimal dismantleQty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子物料编码") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子物料名称") - private String itemPartName; - - @Column(name = "OK_QTY") - @ApiParam("合格数") - private BigDecimal okQty; - - @Column(name = "MISS_QTY") - @ApiParam("缺失数") - private BigDecimal missQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数") - private BigDecimal scrapQty; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Transient - private String serialNumber; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java deleted file mode 100644 index 25fe6ee..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2020/9/23 18:47 - * @desc - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_ALARM_RECORD", indexes = { - @Index(columnList = "WORK_CENTER_CODE") -}) -@Api("设备自动报警记录表") -public class MesEquAlarmRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1675134362612851879L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "ALARM_LEVEL") - @ApiParam("报警等级") - private Integer alarmLevel; - - @Column(name = "ALARM_START_TIME") - @ApiParam("报警开始时间") - private String alarmStartTime; - - @Column(name = "ALARM_STOP_TIME") - @ApiParam("报警开始时间") - private String alarmStopTime; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java deleted file mode 100644 index df432f3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :生产设备 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQUIPMENT") -@Api("生产设备") -public class MesEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 7269069290035250108L; - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Column(name = "EQUIPMENT_NAME") - @ApiParam("设备名称") - private String equipmentName; - - @Column(name = "STATUS") - @ApiParam("设备状态") - private Integer status; - - @Column(name = "EQUIPMENT_TYPE") - @ApiParam("设备类型") - private Integer equipmentType; - - @Column(name = "EQUIPMENT_CATEGORY") - @ApiParam("设备类别") - private String equipmentCategory; - - @Column(name = "EQUIPMENT_MODEL") - @ApiParam("型号") - private String equipmentModel; - - @Column(name = "EQUIPMENT_SPEC") - @ApiParam("规格") - private String equipmentSpec; - - @Column(name = "EQUIPMENT_MAKER") - @ApiParam("制造商") - private String equipmentMaker; - - @Column(name = "RELEASE_DATE") - @ApiParam("出厂日期") - private String releaseDate; - - @Column(name = "RECEIVE_DATE") - @ApiParam("接收日期") - private String receiveDate; - - @Column(name = "ENABLE_DATE") - @ApiParam("启用日期") - private String enableDate; - - @Column(name = "CONNECT_TYPE") - @ApiParam("连接类型") - private Integer connectType; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Transient - @ApiParam(value = "名称") - private String name; - - // 默认值 -1 - @Transient - @ApiParam(value = "父节点", access = "父节点", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java deleted file mode 100644 index 655c2f4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java +++ /dev/null @@ -1,93 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/7/30 9:30 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ESOP") -@Api("作业指导书信息表(ODS)") -public class MesEsop extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4869646502033099294L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步序号") - private Integer stepSeq; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - - @Transient - @ApiParam("文件名称") - private String fileName; - - @Transient - @ApiParam("文件URL") - private String fileUrl; - - @Transient - @ApiParam("组名") - private String groupName; - - @Transient - @ApiParam("文件原名") - private String fileOriginName; - - @Transient - @ApiParam("文件大小") - private String fileSize; - - @Transient - @ApiParam("文件类型名称") - private String fileType; - - @Transient - @ApiParam("同步标记") - private Integer syncTag = 0; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java deleted file mode 100644 index cc17b50..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务事件 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EVENT") -@Api("系统业务事件") -public class MesEvent extends BaseBean implements Serializable { - private static final long serialVersionUID = -5604724665202938464L; - @Column(name = "EVENT_CODE") - @ApiParam("事件代码") - private String eventCode; - - @Column(name = "EVENT_NAME") - @ApiParam("事件名称") - private String eventName; - - @Column(name = "EVENT_TYPE") - @ApiParam("事件类型") - private Integer eventType; - - @Column(name = "BUTTON_CODE") - @ApiParam("按钮代码") - private String buttonCode; - - public int getEventTypeVal() { - return this.eventType == null ? 0 : this.eventType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java deleted file mode 100644 index 2a16eb0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务事件动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EVENT_ACTION") -@Api("系统业务事件动作") -public class MesEventAction extends BaseBean implements Serializable { - private static final long serialVersionUID = 3964084375279916831L; - @Column(name = "EVENT_CODE") - @ApiParam("事件代码") - private String eventCode; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java deleted file mode 100644 index f128453..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/10 8:37 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_FI_CFG") -@Api("首检件配置") -public class MesFiCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1791614973371037158L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java deleted file mode 100644 index a90ed92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/12/4 1:28 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_FILE") -@Api("文件表") -public class MesFile extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7017379708394714424L; - @Column(name = "FILE_NAME") - @ApiParam("文件名称") - private String fileName; - - @Column(name = "FILE_URL") - @ApiParam("文件URL") - private String fileUrl; - - @Column(name = "GROUP_NAME") - @ApiParam("组名") - private String groupName; - - @Column(name = "FILE_ORIGIN_NAME") - @ApiParam("文件原名") - private String fileOriginName; - - @Column(name = "FILE_SIZE") - @ApiParam("文件大小") - private String fileSize; - - @Column(name = "FILE_TYPE") - @ApiParam("文件类型名称") - private String fileType; - - @Column(name = "SYNC_TAG") - @ApiParam("同步标记") - private Integer syncTag = 0; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java deleted file mode 100644 index 243e6a9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java +++ /dev/null @@ -1,65 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :物料关键数据 - * @Reference : - * @Author : crish - * @CreateDate : 2019-05-15 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_KP_DATA") -@Api("生产区域") -public class MesKpData extends BaseBean implements Serializable { - private static final long serialVersionUID = -3332582267186642790L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "KEY_DATA_CODE") - @ApiParam("关键数据代码") - private String keyDataCode; - - @Column(name = "KEY_DATA_NAME") - @ApiParam("关键数据名称") - private String keyDataName; - - @Column(name = "KEY_DATA_COUNT") - @ApiParam("关键数据数量") - private Integer keyDataCount; - - @Column(name = "UPPER_LIMIT") - @ApiParam("数据上限") - private Double upperLimit; - - @Column(name = "LOWER_LIMIT") - @ApiParam("数据下限") - private Double lowerLimit; - - @Transient - @ApiParam("扭矩值") - private Double torqueValue; - - @Transient - @ApiParam("是否在范围之内") - private Boolean ok; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java deleted file mode 100644 index 9ca9ac7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java +++ /dev/null @@ -1,95 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_KPSN_RULE") -@Api("关键件条码校验规则") -public class MesKpsnRule extends BaseBean implements Serializable { - private static final long serialVersionUID = 8238308232531730720L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "LENGTH") - @ApiParam("长度") - private Integer length; - - @Column(name = "FROM1") - @ApiParam("起始1") - private Integer from1; - - @Column(name = "TO1") - @ApiParam("至1") - private Integer to1; - - @Column(name = "FIX1") - @ApiParam("内容1") - private String fix1; - - @Column(name = "FROM2") - @ApiParam("起始2") - private Integer from2; - - @Column(name = "TO2") - @ApiParam("至2") - private Integer to2; - - @Column(name = "FIX2") - @ApiParam("内容2") - private String fix2; - - @Column(name = "TYPE") - @ApiParam("类型") - private String type; - - @Column(name = "BIND_RULE") - @ApiParam("绑定规则") - private Integer bandRule; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - public int getLengthVal() { - return this.length == null ? 0 : this.length; - } - - public int getFrom1Val() { - return this.from1 == null ? 0 : this.from1; - } - - public int getTo1Val() { - return this.to1 == null ? 0 : this.to1; - } - - public int getFrom2Val() { - return this.from2 == null ? 0 : this.from2; - } - - public int getTo2Val() { - return this.to2 == null ? 0 : this.to2; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java deleted file mode 100644 index 589c237..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.util.List; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-18 11:00 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_LABEL_TEMPLATE") -@Api(value = "打印模板", description = "打印模板") -public class MesLabelTemplate extends BaseBean implements Serializable { - - - private static final long serialVersionUID = 3797103812377146878L; - @Column(name = "TEMPLATE_CODE") - @ApiParam(value = "模板代码") - private String templateCode; - - @Column(name = "TEMPLATE_NAME") - @ApiParam(value = "模板名称") - private String templateName; - - @Lob - @Column(name = "TEMPLATE_CONTENT") - @ApiParam(value = "模板内容") - private String templateContent; - - // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value = "模板参数拼接") - @Transient - private String paramsPack; - - @Transient - @ApiParam(value = "模板id对应的模板参数") - private List labelTemplateParamList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java deleted file mode 100644 index 253f29a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.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 : crish - * @CreateDate : 2019-08-18 11:00 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_LABEL_TEMPLATE_PARAM") -@Api(value = "打印模板参数", description = "打印模板参数") -public class MesLabelTemplateParam extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3595706874099358555L; - @Column(name = "TEMPLATE_ID") - @ApiParam(value = "模板ID", access = "模板ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name = "TEMPLATE_CODE") - @ApiParam(value = "模板代码") - private String templateCode; - - @Column(name = "TEMPLATE_PARAM") - @ApiParam(value = "模板参数") - private String templateParam; - - @Lob - @Column(name = "TEMPLATE_PARAM_TEXT") - @ApiParam(value = "模板参数描述") - private String templateParamText; - - // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value = "模板参数值") - @Transient - private String templateParamValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java deleted file mode 100644 index e8daace..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务方法 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_METHOD") -@Api("系统业务方法") -public class MesMethod extends BaseBean implements Serializable { - private static final long serialVersionUID = -3629909409034083767L; - @Column(name = "METHOD_CODE") - @ApiParam("方法代码") - private String methodCode; - - @Column(name = "METHOD_NAME") - @ApiParam("方法名称") - private String methodName; - - @Column(name = "CALL_CLASS") - @ApiParam("具体实现类") - private String callClass; - - /** - * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） - */ - @Column(name = "METHOD_TYPE") - @ApiParam("方法类型") - private Integer methodType; - - public int getMethodTypeVal() { - return this.methodType == null ? 0 : this.methodType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java deleted file mode 100644 index 3e81c47..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 17:11 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_MONITOR_TASK") -@Api("监听任务") -public class MesMonitorTask extends BaseBean implements Serializable { - - private static final long serialVersionUID = -8614480099840448294L; - @Column(name = "TASK_NO") - @ApiParam("任务编号") - private String taskNo; - - @Column(name = "TASK_NAME") - @ApiParam("任务名称") - private String taskName; - - @Column(name = "TASK_OBJECT_TYPE") - @ApiParam("任务对象类型") - private Integer taskObjectType; - - @Column(name = "TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - - @Column(name = "TASK_EXCEPTION_DESC") - @ApiParam("异常描述") - private String taskExceptionDesc; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java deleted file mode 100644 index 891dc65..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 17:19 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_MONITOR_TASK_DETAIL") -@Api("监听任务明细") -public class MesMonitorTaskDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4811270359386960747L; - @Column(name = "TASK_NO") - @ApiParam("任务编号") - private String taskNo; - - @Column(name = "DATA_OBJECT_NO") - @ApiParam("数据对象编号") - private String dataObjectNo; - -// @Column(name = "STORE_OBJECT_CODE") -// @ApiParam("存储对象代码") -// private String storeObjectCode; -// -// @Column(name = "STORE_FIELD_CODE") -// @ApiParam("存储字段代码") -// private String storeFieldCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java deleted file mode 100644 index 9fc51c2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/22 5:59 PM - * @Description: - **/ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_NUMBER_RULE") -@Api("条码生成规则") -public class MesNumberRule extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4039194855353751178L; - @Column(name = "RULE_CODE") - @ApiParam("规则代码") - private String ruleCode; - - @Column(name = "RULE_DESC") - @ApiParam("规则描述") - private String ruleDesc; - - @Column(name = "PREFIX") - @ApiParam("前缀") - private String prefix; - - @Column(name = "NUMBER_RULE") - @ApiParam("编码规则") - private String numberRule; - - @Column(name = "SERIALNO_LENGTH") - @ApiParam("序号长度") - private Integer serialnoLength; - - @Column(name = "SERIALNO_INCREMENT") - @ApiParam("增量") - private Integer serialnoIncrement; - - @Column(name = "IS_CYCLE") - @ApiParam("最大值后循环") - private Integer isCycle; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java deleted file mode 100644 index 16436c6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 9:14 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_NUMBER_SERIALNO") -@Api("编码序号") -public class MesNumberSerialno extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3024166851634742872L; - @Column(name = "CURRENT_NUMBER_PREFIX") - @ApiParam("当前编号前缀") - private String currentNumberPrefix; - - @Column(name = "CURRENT_SERIALNO") - @ApiParam("当前序号") - private Integer currentSerialno; - - @Column(name = "CURRENT_NUMBER") - @ApiParam("当前编号") - private String currentNumber; - - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java deleted file mode 100644 index 5b7c166..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:14 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_OBJECT_CFG") -@Api("对象结构") -public class MesObjectCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3640782210450491835L; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "FIELD_CODE") - @ApiParam("字段代码") - private String fieldCode; - - @Column(name = "FIELD_NAME") - @ApiParam("字段名称") - private String fieldName; - - @Column(name = "FIELD_TYPE") - @ApiParam("字段类型") - private String fieldType; - - @Column(name = "FIELD_LENGTH") - @ApiParam("列长度") - private Integer fieldLength; - - @Column(name = "POJO_ATTR") - @ApiParam("对应的pojo属性") - private String pojoAttr; - - @Column(name = "IS_SAVE") - @ApiParam("是否保存 1存 2不存") - private Integer isSave; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java deleted file mode 100644 index 38c0363..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :PLC设备信息配置表 - * @Reference : - * @Author : Crish - * @CreateDate : 2019-05-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC_CONFIGURE") -@Api("PLC设备信息配置表") -@Deprecated -public class MesPLCConfigure extends BaseBean implements Serializable { - private static final long serialVersionUID = 8274445475806774L; - @Column(name = "IP") - @ApiParam("设备ip") - private String ipAddress; - - @Column(name = "CHANNEL_NAME") - @ApiParam("通道名称") - private String channelName; - - @Column(name = "DEVICE_NAME") - @ApiParam("设备地址") - private String deviceName; - - @Column(name = "TAG_NAME") - @ApiParam("标签地址") - private String tagName; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java deleted file mode 100644 index 7ca973d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :包装规格 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACK_SPEC") -@Api("包装规格") -public class MesPackSpec extends BaseBean implements Serializable { - private static final long serialVersionUID = -788654193624068327L; - @Column(name = "SPEC_CODE") - @ApiParam("包装规格代码") - private String specCode; - - @Column(name = "SPEC_NAME") - @ApiParam("包装规格名称") - private String specName; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "包装数量", example = "0") - private Double qty; - - @Column(name = "QTY2") - @ColumnDefault("0") - @ApiParam(value = "包装数量2", example = "0") - private Double qty2; - - @Column(name = "QTY3") - @ColumnDefault("0") - @ApiParam(value = "包装数量3", example = "0") - private Double qty3; - - @Column(name = "QTY4") - @ColumnDefault("0") - @ApiParam(value = "包装数量4", example = "0") - private Double qty4; - - @Column(name = "IS_MIXED") - @ApiParam("是否混包") - private Integer isMixed; - - @Column(name = "IS_MIXED2") - @ApiParam("是否混包2") - private Integer isMixed2; - - @Column(name = "IS_MIXED3") - @ApiParam("是否混包3") - private Integer isMixed3; - - @Column(name = "IS_MIXED4") - @ApiParam("是否混包4") - private Integer isMixed4; - - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getIsMixedVal() { - return this.isMixed == null ? 0 : this.isMixed; - } - - public int getIsMixed2Val() { - return this.isMixed2 == null ? 0 : this.isMixed2; - } - - public int getIsMixed3Val() { - return this.isMixed3 == null ? 0 : this.isMixed3; - } - - public int getIsMixed4Val() { - return this.isMixed4 == null ? 0 : this.isMixed4; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java deleted file mode 100644 index 5eeff9e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ /dev/null @@ -1,119 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 1:26 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) -} -) -@Api("包装规格") -public class MesPackage extends BaseBean implements Serializable { - private static final long serialVersionUID = 2292859018089339608L; - @Column(name = "PACKAGE_NO", nullable = false) - @ApiParam("包装编号") - private String packageNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "PACK_SPEC_QTY") - @ApiParam("包装规格数量") - private Double packSpecQty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "LOT_NO") - @ApiParam("批号") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批号") - private String fixLotNo; - - @Column(name = "PACK_SPEC") - @ApiParam("包装规格") - private String packSpec; - - @Column(name = "IS_SEALED") - @ApiParam("是否封箱") - private Integer isSealed; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态10：未打印 20：已打印") - private Integer printStatus; - - @Column(name = "PACK_LEVEL") - @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") - private Integer packLevel; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Transient - @ApiParam("封箱状态") - private String sealStatus; - - @Transient - @ApiParam("打印状态文字") - private String printStrStatus; - - @Transient - @ApiParam("打印缓存id") - private String printId; - - public MesPackage() { - } - - public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { - this.packageNo = packageNo; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.qty = qty; - this.packSpecQty = packSpecQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java deleted file mode 100644 index a987364..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 2:55 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) -} -) -@Api("包装规格明细") -public class MesPackageDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8162606304720621672L; - @Column(name = "PACKAGE_NO", nullable = false) - @ApiParam("包装编码") - private String packageNo; - - @Column(name = "SERIAL_NUMBER", nullable = false) - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("物料编号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编码2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编码3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编码4") - private String packageNo4; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java deleted file mode 100644 index 72084e3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 3:23 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) -@Api("包装履历表") -public class MesPackageTravel extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2808747095415676213L; - @Column(name = "PACKAGE_NO") - @ApiParam("包装编码") - private String packageNo; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "OP_TYPE") - @ApiParam("操作类型") - private Integer opType; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编码2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编码3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编码4") - private String packageNo4; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java deleted file mode 100644 index 81365ef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ /dev/null @@ -1,93 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :物料信息 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART") -@Api("物料信息") -public class MesPart extends BaseBean implements Serializable { - private static final long serialVersionUID = 3936033255397936854L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("零件名称") - private String partName; - - @Column(name = "BRIEF_TEXT") - @ApiParam("零件简称") - private String briefText; - - @Column(name = "PART_SPEC") - @ApiParam("零件规格") - private String partSpec; - - @Column(name = "CATEGORY_CODE1") - @ApiParam("分类1") - private String categoryCode1; - - @Column(name = "CATEGORY_CODE2") - @ApiParam("分类2") - private String categoryCode2; - - @Column(name = "CATEGORY_CODE3") - @ApiParam("分类3") - private String categoryCode3; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "PACK_SPEC_CODE") - @ApiParam("包装规格代码") - private String packSpecCode; - - @Column(name = "DEFAULT_WORK_CENTER") - @ApiParam("默认工作中心") - private String defaultWorkCenter; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PROCESS_MATCH_TYPE") - @ApiParam("过程编码匹配类型") - private Integer processMatchType; - - @Column(name = "PACKAGE_MATCH_TYPE") - @ApiParam("包装编码匹配类型") - private Integer packageMatchType; - - @Column(name = "PRODUCT_MATCH_TYPE") - @ApiParam("产品编码匹配类型") - private Integer productMatchType; - - @Transient - @ApiParam("分类名称") - private String categoryName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java deleted file mode 100644 index 949a02f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :零件种类 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART_CATEGORY") -@Api("零件种类") -public class MesPartCategory extends BaseBean implements Serializable { - private static final long serialVersionUID = 9076081904146489470L; - @Column(name = "CATEGORY_CODE") - @ApiParam("分类代码") - private String categoryCode; - - @Column(name = "CATEGORY_NAME") - @ApiParam("分类名称") - private String categoryName; - - @Column(name = "CATEGORY_TYPE") - @ApiParam("分类类型") - private String categoryType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java deleted file mode 100644 index 94f495f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/16 0016 - 15:50 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART_FORMULA") -@Api("MES_物料配方") -public class MesPartFormula extends BaseBean implements Serializable { - - private static final long serialVersionUID = 3120650997069271308L; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "FORMULA_CONTENT") - @ApiParam("配方内容") - private String formulaContent; - - @Column(name = "FORMULA_TYPE") - @ApiParam("配方类型") - private Integer formulaType; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java deleted file mode 100644 index 9c8adca..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :JIS发运模式 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PATTERN_JIS") -@Api("JIS发运模式") -public class MesPatternJis extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1119289554542499312L; - @Column(name = "PATTERN_NO") - @ApiParam("模式编号") - private String patternNo; - - @Column(name = "PATTERN_NAME") - @ApiParam("模式名称") - private String patternName; - - @Column(name = "QUEUE_NO") - @ApiParam("显示主队列数") - private Integer queueNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; - - @Column(name = "PATTERN_DESC") - @ApiParam("描述") - private String patternDesc; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型组") - private String produceCategoryCode; - - @Column(name = "PATTERN_TYPE") - @ApiParam("模式类型") - private Integer patternType; - - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java deleted file mode 100644 index c19bfa3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN") -@Api("PCN节点") -public class MesPcn extends BaseBean implements Serializable { - private static final long serialVersionUID = -7570827672640277097L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "PCN_NAME") - @ApiParam("PCN名称") - private String pcnName; - - @Column(name = "AREA_CODE") - @ApiParam("区域") - private String areaCode; - - @Column(name = "AREA_NAME") - @ApiParam("区域名称") - private String areaName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "PCN_VERSION") - @ApiParam("PCN版本") - private String pcnVersion; - - @Column(name = "CONNECT_IP") - @ApiParam("连接IP") - private String connectIp; - - @Column(name = "CONNECT_COUNT") - @ApiParam("连接次数") - private Integer connectCount; - - @Column(name = "IS_CONNECT") - @ApiParam("是否连接") - private Integer isConnect; - - @Column(name = "CONNECT_TIME") - @ApiParam("连接时间") - private String connectTime; - - @Column(name = "CODE_SPECIFIC") - @ApiParam("PCN特殊字段") - private String codeSpecific; - - public int getConnectCountVal() { - return this.connectCount == null ? 0 : this.connectCount; - } - - public int getIsConnectVal() { - return this.isConnect == null ? 0 : this.isConnect; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java deleted file mode 100644 index faa7f92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_CONNECT_LOG") -@Api("PCN节点连接日志") -public class MesPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -4153357131289178766L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "PCN_NAME") - @ApiParam("PCN名称") - private String pcnName; - - @Column(name = "PCN_VERSION") - @ApiParam("PCN版本") - private String pcnVersion; - - @Column(name = "CONNECT_IP") - @ApiParam("连接IP") - private String connectIp; - - @Column(name = "IS_CONNECT") - @ApiParam("是否连接") - private Integer isConnect; - - @Column(name = "REMARK") - @ApiParam("备注") - private String Remark; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java deleted file mode 100644 index 4d321f8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java +++ /dev/null @@ -1,92 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYNC_CFG") -@Api("MES_PCN_同步配置") -public class MesPcnSyncCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -6869288362923390521L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "OBJECT_KEY") - @ApiParam("对象主键") - private String objectKey; - - @Column(name = "SYNC_FREQUENCY") - @ApiParam("同步频率") - private Integer syncFrequency; - - @Column(name = "SYNC_TIME") - @ApiParam(value = "同步时间") - private String syncTime; - - @Column(name = "SYNC_PATTERN") - @ApiParam("同步方式 2.新增 1.修改") - private Integer syncPattern; - - @Column(name = "SYNC_TYPE") - @ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes") - private Integer syncType; - - @Column(name = "LAST_SYNC_TIME") - @ApiParam(value = "上一同步时间") - private String lastSyncTime; - - @Column(name = "EXTRACT_GAP") - @ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制") - private Integer extractGap; - - @Column(name = "EXTRACT_CONDITION") - @ApiParam(value = "从数据库抽取的条件限制") - private String extractCondition; - - @Column(name = "IS_IGNORE_ORG") - @ApiParam(value = "同步的时候是否区分工厂") - private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); - - public int getSyncFrequencyVal() { - return this.syncFrequency == null ? 0 : this.syncFrequency; - } - - public int getSyncTypeVal() { - return this.syncType == null ? 0 : this.syncType; - } - - public int getSyncPatternVal() { - return this.syncPattern == null ? 0 : this.syncPattern; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java deleted file mode 100644 index 22810be..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYNC_ERRORLOG") -@Api("MES_PCN同步异常日志") -public class MesPcnSyncErrorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -2249754641660006488L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "ERROR_SPOT") - @ApiParam("异常位置") - private String errorSpot; - - @Lob - @Column(name = "ERROR_CONTENT") - @ApiParam("异常内容") - private String errorContent; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java deleted file mode 100644 index fc4f33b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ /dev/null @@ -1,70 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.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; -import java.util.List; - -/** - * @Description : 账号离线登陆表 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-09-01 11:02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYS_USER_OFFLINE") -@Api(value = "账号离线登陆表", description = "账号离线登陆表。") -public class MesPcnSysUserOffline extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7617353154826718154L; - @Column(name = "USER_ID") - @ApiParam(value = "人员ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long userId; - - @Column(name = "USER_CODE") - @ApiParam(value = "用户编号", access = "用户编号") - private String userCode; - - @Column(name = "USER_NAME") - @ApiParam(value = "用户名称", access = "账号名称") - private String userName; - - @Column(name = "LOGIN_NAME") - @ApiParam(value = "登陆名称", access = "登陆名称") - private String loginName; - - @Column(name = "USER_TYPE") - @ApiParam(value = "账号类型（枚举，待定）", example = "-1") - private Integer userType; - - @Lob - @Column(name = "LOGIN_INFO") - @ApiParam(value = "登陆信息", access = "登陆信息") - private String loginInfo; - - @Lob - @Column(name = "MENU_LIST") - @ApiParam(value = "菜单", access = "菜单") - private String menuList; - - @Lob - @Column(name = "MODULE_LIST") - @ApiParam(value = "模块", access = "模块") - private String moduleList; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java deleted file mode 100644 index 8288401..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes-pcn定时任务工作清单 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-26 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_TASK") -@Api("mes-pcn定时任务工作清单") -public class MesPcnTask extends BaseBean implements Serializable { - - private static final long serialVersionUID = 4777357978430670966L; - @Column(name = "TASK_CODE") - @ApiParam("任务代码") - private String taskCode; - - @Column(name = "TASK_NAME") - @ApiParam("任务名称") - private String taskName; - - @Column(name = "TASK_GROUP_NAME") - @ApiParam("任务组名称") - private String taskGroupName; - - @Column(name = "TASK_DESCRIPTION") - @ApiParam("任务描述") - private String taskDescription; - - @Column(name = "TASK_TYPE") - @ApiParam("任务类型") - private Integer taskType; - - @Column(name = "TASK_MODULE") - @ApiParam("任务模块") - private String taskModule; - - @Column(name = "TASK_CLASS") - @ApiParam("任务类名") - private String taskClass; - - @Column(name = "TASK_PACKAGE") - @ApiParam("任务包名") - private String taskPackage; - - @Column(name = "PCN_NAME") - @ApiParam("PCN节点名称") - private String pcnName; - - @Column(name = "PCN_CODE") - @ApiParam("PCN节点名称代码") - private String pcnCode; - - @Column(name = "TASK_CYCLE_EXPS") - @ApiParam("任务周期表达式") - private String taskCycleExps; - - @Column(name = "TASK_CYCLE_DESCRIPTION") - @ApiParam("任务周期描述") - private String taskCycleDescription; - - @Column(name = "TASK_PARAM") - @ApiParam("任务参数") - private String taskParam; - - public int getTaskTypeVal() { - return this.taskType == null ? 0 : this.taskType; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java deleted file mode 100644 index f0ee69f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes-pcn定时任务工作清单同步记录 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-27 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_TASK_LOG") -@Api("mes-pcn定时任务工作清单同步记录") -public class MesPcnTaskLog extends BaseBean implements Serializable { - - private static final long serialVersionUID = -784806389462540310L; - @Column(name = "SYNC_TIME_START") - @ApiParam("同步数据开始时间") - private String syncTimeStart; - - @Column(name = "SYNC_TIME_END") - @ApiParam("同步数据截止时间") - private String syncTimeEnd; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_CONTENT") - @ApiParam("异常内容") - private Long errorContent; - - public int getSyncStatusVal() { - return this.syncStatus == null ? 0 : this.syncStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java deleted file mode 100644 index bfd78e2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ /dev/null @@ -1,144 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; -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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) -} -) -@Api("生产主计划") -public class MesPlanOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 8571104279843276872L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("生产计划单号") - private String orderNo; - - @Column(name = "PO_TYPE") - @ApiParam("计划类型") - private Integer planType; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PLAN_QTY") - @ApiParam("计划数量") - private Double planQty; - - @Column(name = "DECOMPOSE_QTY") - @ApiParam("分解数量") - private Double decomposeQty; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam("计划开始时间") - private String startTime; - - @Column(name = "END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam("计划结束时间") - private String endTime; - - @Column(name = "DELIVERY_DATE") - @ApiParam("交货日期") - private String deliveryDate; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "SOURCE") - @ApiParam("计划来源") - private String source; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - /********************** 冗余字段 *********************************/ - - @Transient - @ApiParam(value = "区域") - public String areaCode; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - public double getPlanQtyVal() { - return this.planQty == null ? 0.0d : this.planQty; - } - - public double getDecomposeQtyVal() { - return this.decomposeQty == null ? 0.0d : this.decomposeQty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public int getPlanTypeVal() { - return this.planType == null ? 0 : this.planType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java deleted file mode 100644 index 5d5a48c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ /dev/null @@ -1,112 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/25 8:07 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC") -@Api("PLC配置表") -public class MesPlc extends BaseBean implements Serializable { - - private static final long serialVersionUID = -5346536604317095818L; - @Column(name = "PLC_CODE") - @ApiParam("PLC代码") - private String plcCode; - - @Column(name = "PLC_NAME") - @ApiParam("PLC名称") - private String plcName; - - @Column(name = "PLC_MODEL") - @ApiParam("PLC型号") - private String plcModel; - - @Column(name = "PLC_IP") - @ApiParam("PLC IP") - private String plcIp; - - @Column(name = "CHANNEL") - @ApiParam("通道") - private String channel; - - @Column(name = "TAG_NAME") - @ApiParam("标签名称") - private String tagName; - - @Column(name = "TAG_ADDRESS") - @ApiParam("标签地址") - private String tagAddress; - - @Column(name = "DATA_TYPE") - @ApiParam("标签数据类型") - private String dataType; - - @Column(name = "GROUP_NAME") - @ApiParam("分组名称") - private String groupName; - - @Column(name = "DEVICE") - @ApiParam("驱动") - private String device; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "PLC_CFG") - @ApiParam("PLC的值的设定") - private String plcCfg; - - @Column(name = "ANALYSIS_RULE") - @ApiParam("解析规则") - private String analysisRule; - - @Column(name = "IS_ANALYSIS") - @ApiParam("是否解析") - private String isAnalysis; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Transient - @ApiParam("设备名称") - private String equipmentName; - - @Column(name = "TOOLING_CODE ") - @ApiParam("工装代码") - private String toolingCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java deleted file mode 100644 index 752400b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工序 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROCESS") -@Api("工序") -public class MesProcess extends BaseBean implements Serializable { - private static final long serialVersionUID = -2619648674238082872L; - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "PROCESS_NAME") - @ApiParam("工序名称") - private String processName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java deleted file mode 100644 index 8114387..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ /dev/null @@ -1,106 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Description :产品绑定记录表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "KP_SN") -}) -@Api("产品绑定记录表") -public class MesProdBindRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -4319604821328717354L; - @Column(name = "SERIAL_NUMBER") - @ApiParam(value = "产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品条码零件号") - private String partNo; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单号") - private String workOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元") - private String workCellCode; - - @Column(name = "STEP_CODE") - @ApiParam(value = "工步代码") - private String stepCode; - - @Column(name = "ITEM_PART_NO") - @ApiParam("原材料零件号") - private String itemPartNo; - - @Column(name = "KP_SN") - @ApiParam("原材料条码") - private String kpSn; - - @Column(name = "KP_QTY") - @ColumnDefault("0") - @ApiParam(value = "原材料数量", example = "0") - private Double kpQty; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商") - private String supplierCode; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "IS_FEED") - @ApiParam("是否投料配置") - private Integer isFeed; - - @Column(name = "VERSION") - @ApiParam("版本") - private String version; - - @Column(name = "RESULT") - @ApiParam(value = "结果") - private String result; - - @Column(name = "is_BIND_KEY") - @ApiParam(value = "是否绑定关键件") - private Integer isBindKey; - - @Column(name = "ACTION_TYPE") - @ApiParam(value = "动作类型") - private Integer actionType; - - public int getIsFeedVal() { - return this.isFeed == null ? 0 : this.isFeed; - } - - public double getQtyVal() { - return this.kpQty == null ? 0.0d : this.kpQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java deleted file mode 100644 index 4ff20da..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :产品配置 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_CFG") -@Api("产品配置") -public class MesProdCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7487874316722319947L; - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PROD_CFG_NAME") - @ApiParam("产品配置名称") - private String prodCfgName; - - @Column(name = "PROD_CFG_Type_CODE") - @ApiParam("产品配置类型代码") - private String prodCfgTypeCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java deleted file mode 100644 index fd4cf72..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :产品配置明细 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_CFG_DETAIL") -@Api("产品配置明细") -public class MesProdCfgDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -8362302529703401583L; - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "IS_VIRTUAL") - @ApiParam("是否虚零件") - private Integer isVirtual; - - @Transient - @ApiParam("零件名称") - private String partName; - - public int getIsVirtualVal() { - return this.isVirtual == null ? 0 : this.isVirtual; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java deleted file mode 100644 index a68bcec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 3:25 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_PACK") -@Api("产品包装关系") -public class MesProdPack extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2621135811864108025L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "PACK_SPEC") - @ApiParam("包装规格") - private String packSpec; - - @Column(name = "PROD_LABEL_TEMPLATE") - @ApiParam("产品标签模板") - private String prodLabelTemplate; - - @Column(name = "PACK_LABEL_TEMPLATE") - @ApiParam("包装标签模板") - private String packLabelTemplate; - - @Column(name = "PACK_LABEL_TEMPLATE2") - @ApiParam("包装标签模板2") - private String packLabelTemplate2; - - @Column(name = "PACK_LABEL_TEMPLATE3") - @ApiParam("包装标签模板3") - private String packLabelTemplate3; - - @Column(name = "PACK_LABEL_TEMPLATE4") - @ApiParam("包装标签模板4") - private String packLabelTemplate4; - - @Column(name = "PROD_CFG_TYPE") - @ApiParam("项目") - private String prodCfgType; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java deleted file mode 100644 index 4e8c76d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :产品类流程配置表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_CFG") -@Api("产品类流程配置表") -public class MesProdRouteCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -3768632071281056796L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java deleted file mode 100644 index 169af24..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :产品流程配置操作参数表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_OPT_PARAM") -@Api("产品流程配置操作参数表") -public class MesProdRouteOptParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -932364659894292000L; - @Column(name = "PROD_ROUTE_CFG_ID") - @ApiParam("产品流程ID") - private Long prodRouteCfgId; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步顺序") - private Integer stepSeq; - - @Column(name = "PARAM_CODE") - @ApiParam("工步参数代码") - private String paramCode; - - @Column(name = "PARAM_VALUE") - @ApiParam("工步参数值") - private String paramValue; - - public long getProdRouteCfgIdVal() { - return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId; - } - - public int getStepSeq() { - return this.stepSeq == null ? 0 : this.stepSeq; - } - - public void setStepSeq(int stepSeq) { - this.stepSeq = stepSeq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java deleted file mode 100644 index f6e32ce..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description :散件产品配置明细 - * @Reference : - * @Author : zcg - * @Date : 2020/3/9 0009 - 17:52 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_SCATTER_CFG_BOM") -@Api("散件产品配置明细") -public class MesProdScatterCfgBom extends BaseBean implements Serializable { - - @Column(name = "SP_CFG_CODE") - @ApiParam("散件配置编码") - private String spCfgCode; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品位置代码") - private String produceCtgyCode; - - @Column(name = "PART_NO") - @ApiParam("散件产品代码") - private String partNo; - - @Column(name = "ITEM_PART_NO") - @ApiParam("原材料物料号") - private String itemPartNo; - - @Column(name = "QTY") - @ApiParam("用量") - private BigDecimal qty; - - @Column(name = "IS_KEY_PART") - @ApiParam("是否关键件") - private Integer isKeyPart; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java deleted file mode 100644 index 5520632..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-26-10:25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_CATEGORY") -@Api("系统业务动作") -public class MesProduceCategory extends BaseBean implements Serializable { - - private static final long serialVersionUID = 4593983703007675620L; - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PRODUCE_CTGY_NAME") - @ApiParam("产品类型名称") - private String produceCategoryName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java deleted file mode 100644 index aeda2b0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_CTGY_PICTURE") -@Api("产品类型图片表") -public class MesProduceCtgyPicture extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7223382567320219332L; - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCtgyCode; - - @Column(name = "SIDE_LOCATION") - @ApiParam("面位") - private String sideLocation; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - - @Transient - @ApiParam("文件名称") - private String fileName; - - @Transient - @ApiParam("文件URL") - private String fileUrl; - - @ApiParam("图片URL") - private String pictureUrl; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java deleted file mode 100644 index 6262a8a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ /dev/null @@ -1,205 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) -} -) -@Api("产品条码表") -public class MesProduceSn extends BaseBean implements Serializable { - - private static final long serialVersionUID = 6641051790330191326L; - - @Column(name = "SERIAL_NUMBER", nullable = false) - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "QC_STATUS") - @ApiParam("质量状态") - private Integer qcStatus; - - @Column(name = "SN_STATUS") - @ApiParam("条码状态") - private Integer snStatus; - - @Column(name = "PRINT_COUNT") - @ApiParam("打印次数") - private Integer printCount; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态") - private Integer printStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS_CODE") - @ApiParam("下一工序代码") - private String nextProcessCode; - - @Column(name = "IN_WC_TIME") - @ApiParam("进产线时间") - private String inWorkCenterTime; - - @Column(name = "OUT_WC_TIME") - @ApiParam("出产线时间") - private String outWorkCenterTime; - - @Column(name = "SHIPPING_TIME") - @ApiParam("发运时间") - private String shippingTime; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "CUST_SN") - @ApiParam("客户条码") - private String custSn; - - @Column(name = "CUST_PART_NO") - @ApiParam("客户零件号") - private String custPartNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "SN_TYPE") - @ApiParam("条码类型 10=正常 20=首检件") - private Integer snType; - - @Column(name = "TRAY_NO") - @ApiParam("托盘号") - private String trayNo; -// -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public transient Integer lockVersion; - - @Transient - @ApiParam("返回信息") - private String resultMsg; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Transient - @ApiParam("下线时间开始") - private String outWorkCenterTimeStart; - - @Transient - @ApiParam("下线时间截止") - private String outWorkCenterTimeEnd; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getQcStatusVal() { - return this.qcStatus == null ? 0 : this.qcStatus; - } - - public int getSnStatusVal() { - return this.snStatus == null ? 0 : this.snStatus; - } - - public int getPrintCountVal() { - return this.printCount == null ? 0 : this.printCount; - } - - public int getPrintStatusVal() { - return this.printStatus == null ? 0 : this.printStatus; - } - - public int getSnTypeVal() { - return this.snType == null ? 0 : this.snType; - } - - @Override - public String toString() { - return "MesProduceSn{" + - "serialNumber='" + serialNumber + '\'' + - ", partNo='" + partNo + '\'' + - ", partNameRdd='" + partNameRdd + '\'' + - ", qty=" + qty + - ", qcStatus=" + qcStatus + - ", snStatus=" + snStatus + - ", printCount=" + printCount + - ", printStatus=" + printStatus + - ", workCenterCode='" + workCenterCode + '\'' + - ", workCellCode='" + workCellCode + '\'' + - ", routeCode='" + routeCode + '\'' + - ", processCode='" + processCode + '\'' + - ", nextProcessCode='" + nextProcessCode + '\'' + - ", inWorkCenterTime='" + inWorkCenterTime + '\'' + - ", outWorkCenterTime='" + outWorkCenterTime + '\'' + - ", shippingTime='" + shippingTime + '\'' + - ", workOrderNo='" + workOrderNo + '\'' + - ", custSn='" + custSn + '\'' + - ", custPartNo='" + custPartNo + '\'' + - ", snType=" + snType + - ", trayNo='" + trayNo + '\'' + - ", resultMsg='" + resultMsg + '\'' + - ", operateType=" + operateType + - ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + - ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java deleted file mode 100644 index 5d8ce41..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ /dev/null @@ -1,154 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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 : dragon.xu - * @CreateDate : 2019-05-29 16:22 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "MODIFY_DATE_TIME") -}) -@Api("产品条码履历表") -public class MesProduceSnTravel extends BaseBean implements Serializable { - private static final long serialVersionUID = -1692487592284871549L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "QC_STATUS") - @ApiParam("质量状态") - private Integer qcStatus; - - @Column(name = "SN_STATUS") - @ApiParam("条码状态") - private Integer snStatus; - - @Column(name = "PRINT_COUNT") - @ApiParam("打印次数") - private Integer printCount; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态") - private Integer printStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS_CODE") - @ApiParam("下一工序代码") - private String nextProcessCode; - - @Column(name = "IN_WC_TIME") - @ApiParam("进产线时间") - private String inWorkCenterTime; - - @Column(name = "OUT_WC_TIME") - @ApiParam("出产线时间") - private String outWorkCenterTime; - - @Column(name = "SHIPPING_TIME") - @ApiParam("发运时间") - private String shippingTime; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "CUST_SN") - @ApiParam("客户条码") - private String custSn; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_PART_NO") - @ApiParam("客户零件号") - private String custPartNo; - - @Column(name = "SN_TYPE") - @ApiParam("条码类型 10=正常（默认），20=首检件") - private Integer snType; - - @Column(name = "TRAY_NO") - @ApiParam("托盘号") - private String trayNo; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Transient - @ApiParam("返回信息") - private String resultMsg; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getQcStatusVal() { - return this.qcStatus == null ? 0 : this.qcStatus; - } - - public int getSnStatusVal() { - return this.snStatus == null ? 0 : this.snStatus; - } - - public int getPrintCountVal() { - return this.printCount == null ? 0 : this.printCount; - } - - public int getPrintStatusVal() { - return this.printStatus == null ? 0 : this.printStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java deleted file mode 100644 index 600bfc2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ /dev/null @@ -1,109 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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 : Wynne.Lu - * @CreateDate : 2019-10-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "OBJECT_CODE"), - @Index(columnList = "MODIFY_DATE_TIME") -}) -@Api("生产数据") -public class MesProductData extends BaseBean implements Serializable { - private static final long serialVersionUID = -2365404168777050771L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CELL_NAME") - @ApiParam("工作单元名称") - private String workCellName; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_DESC") - @ApiParam("物料名称") - private String partDesc; - - @Column(name = "EQU_CODE") - @ApiParam("设备代码") - private String equCode; - - @Column(name = "EQU_NAME") - @ApiParam("设备名称") - private String equName; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "FIELD_CODE") - @ApiParam("字段代码") - private String fieldCode; - - @Column(name = "FIELD_NAME") - @ApiParam("字段名称") - private String fieldName; - - @Column(name = "FIELD_VALUE") - @ApiParam("字段值") - private String fieldValue; - - @Column(name = "ROW_NO") - @ApiParam("数据行号") - private String rowNo; - - @Column(name = "GROUP_NO") - @ApiParam("数据组号") - private String groupNo; - - @Lob - @Column(name = "LINE_DATA") - @ApiParam("生产数据") - private String lineData; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java deleted file mode 100644 index b1b3d8c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_ENCODE_CFG") -@Api("产品编码配置表") -public class MesProductEncodeCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = 6641051790330191326L; - - @Column(name = "CODE_TYPE") - @ApiParam("编码类型") - private Integer codeType; - - @Column(name = "MATCH_TYPE") - @ApiParam("匹配类型") - private Integer matchType; - - @Column(name = "MATCH_VALUE") - @ApiParam("匹配值") - private String matchValue; - - @Column(name = "RULE_CODE") - @ApiParam("编码规则代码") - private String ruleCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java deleted file mode 100644 index b5b9fa2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ /dev/null @@ -1,107 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 16:33 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA", indexes = { - @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "SN") -}) -@Api("质量过程检测数据") -public class MesQcCheckData extends BaseBean implements Serializable { - - private static final long serialVersionUID = 3600528549583720850L; - @Column(name = "CHECK_ID") - @ApiParam("检测id") - private String checkId; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "CHECK_TYPE") - @ApiParam("检测类型") - private Integer checkType; - - @Column(name = "CHECK_ITEM") - @ApiParam("检测项") - private String checkItem; - - @Column(name = "CHECK_STANDARD") - @ApiParam("检测标准") - private String checkStandard; - - @Column(name = "CHECK_GUIDE") - @ApiParam("检测指导") - private String checkGuide; - - @Column(name = "CHECK_FREQUENCY") - @ApiParam("频率") - private String checkFrequency; - - @Column(name = "CHECK_VALUE") - @ApiParam("检测值") - private String checkValue; - - @Column(name = "CHECK_RESULT") - @ApiParam("判定结果") - private String checkResult; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Integer qty; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Transient - @ApiParam("产品条码") - private String serialNumber; - - @Transient - @ApiParam("过程质量检测数据") - private List mesQcCheckStandardList; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java deleted file mode 100644 index be9bfe8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ /dev/null @@ -1,108 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 14:46 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_STANDARD") -@Api("质量检测标准") -public class MesQcCheckStandard extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1590320231495124712L; - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "CHECK_TYPE") - @ApiParam("检测类型") - private Integer checkType; - - @Column(name = "CHECK_ITEM") - @ApiParam("检测项") - private String checkItem; - - @Column(name = "CHECK_STANDARD") - @ApiParam("检测标准") - private String checkStandard; - - @Column(name = "CHECK_GUIDE") - @ApiParam("检测指导") - private String checkGuide; - - @Column(name = "CHECK_FREQUENCY") - @ApiParam("频率") - private String checkFrequency; - - @Transient - @ApiParam("物料名称") - private String partName; - - @Transient - @ApiParam("检测结果") - private String checkResult; - - @Transient - @ApiParam("检测值") - private String checkValue; - - @Column(name = "CHECK_ITEM_TYPE") - @ApiParam("检测项类型") - private String checkItemType; - - @Transient - @ApiParam("检测项类型名称") - private String checkItemTypeName; - - @Transient - private List childQcList; - - public MesQcCheckStandard() { - } - - public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard - , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { - this.id = id; - this.partNo = partNo; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.checkType = checkType; - this.checkItem = checkItem; - this.checkStandard = checkStandard; - this.checkGuide = checkGuide; - this.checkFrequency = checkFrequency; - this.partName = partName; - this.checkItemType = checkItemType; - this.checkItemTypeName = checkItemTypeName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java deleted file mode 100644 index 7d4bd81..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :JIS发运队列 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIS") -@Api("JIS发运队列") -public class MesQueueJis extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8028683333028906395L; - @Column(name = "JIS_NO") - @ApiParam("主队列编号") - private String jisNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "VIN_CODE") - @ApiParam("vin") - private String vinCode; - - @Column(name = "CAR_NO") - @ApiParam("车号") - private String carNo; - - @Column(name = "SEQ") - @ApiParam("排序") - private Double seq; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Transient - @ApiParam("颜色") - private String color; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java deleted file mode 100644 index ef3b7d1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :JIS发运队列明细 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIS_DETAIL") -@Api("JIS发运队列明细") -public class MesQueueJisDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 829273008952400763L; - @Column(name = "JIS_NO") - @ApiParam("主队列编号") - private String jisNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "FINAL_STATUS") - @ApiParam("明细整体状态") - private Integer finalStatus; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java deleted file mode 100644 index ea2e7e7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER", indexes = { - @Index(columnList = "CUST_FLAG_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) -} -) -@Api("生产队列主表") -public class MesQueueOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 6538031118299400711L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("主队列编号") - private String orderNo; - - @Column(name = "VIN_CODE") - @ApiParam("Vin") - private String vinCode; - - @Column(name = "CUST_FLAG_NO") - @ApiParam("客户标识号") - private String custFlagNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PROD_CFG_NAME_RDD") - @ApiParam("产品配置名称") - private String prodCfgNameRdd; - - @Column(name = "SEQ") - @ApiParam("排序") - private Double seq; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Transient - @ApiParam("起始车号") - private String custFlagNoStart; - - @Transient - @ApiParam("截至车号") - private String custFlagNoEnd; - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java deleted file mode 100644 index 61d8c82..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ /dev/null @@ -1,103 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { - @Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) -} -) -@Api("生产队列明细") -public class MesQueueOrderDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 1548933241804083457L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("主队列编号") - private String orderNo; - - @Column(name = "PART_NO", nullable = false) - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "SEQ") - @ApiParam("队列明细序号") - private Double seq; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "WORK_TYPE") - @ApiParam("生产类型") - private String workType; - - @Column(name = "PRODUCE_CATEGORY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PRODUCE_CATEGORY_NAME_RDD") - @ApiParam("产品类型名称") - private String produceCategoryNameRdd; - - @Transient - @ApiParam("队列序号") - private Double queueSeq; - - public double getQueueSeqVal() { - return this.queueSeq == null ? 0.0d : this.queueSeq; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public MesQueueOrderDetail() { - } - - public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) { - this.queueSeq = queueSeq; - this.seq = seq; - this.serialNumber = serialNumber; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java deleted file mode 100644 index 3f3458c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) -@Api("原材料信息") -public class MesRawPartSn extends BaseBean implements Serializable { - private static final long serialVersionUID = 5504323561257182116L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("数量") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("生产批次") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批次") - private String fixLotNo; - - @Column(name = "STATUS") - @ApiParam("原料状态") - private Integer status; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java deleted file mode 100644 index 785f350..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :维修 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-08 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR") -@Api("维修") -public class MesRepair extends BaseBean implements Serializable { - private static final long serialVersionUID = -7520365696308295804L; - @Column(name = "REPAIR_CODE") - @ApiParam("维修代码") - private String repairCode; - - @Column(name = "REPAIR_NAME") - @ApiParam("维修名称") - private String repairName; - - @Column(name = "REPAIR_TYPE") - @ApiParam("维修类型") - private Integer repairType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java deleted file mode 100644 index e6da731..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ /dev/null @@ -1,102 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:33 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("维修信息记录表") -public class MesRepairRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2453726410779076150L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "SIDE_LOCATION") - @ApiParam("产品面位") - private String sideLocation; - - @Column(name = "DEFECT_LOCATION") - @ApiParam("缺陷位置") - private String defectLocation; - - @Column(name = "REPAIR_CODE") - @ApiParam("维修代码") - private String repairCode; - - @Column(name = "REPAIR_NAME") - @ApiParam("维修名称") - private String repairName; - - @Column(name = "DC_CODE") - @ApiParam("缺陷原因代码") - private String dcCode; - - @Column(name = "DC_NAME") - @ApiParam("缺陷原因描述") - private String dcName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Transient - @ApiParam("备注") - private String spareMemo; - - @Transient - @ApiParam("不良记录id") - private Long defectRecordId; - - @Transient - @ApiParam("缺陷集合") - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java deleted file mode 100644 index f8b2802..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :流程表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE") -@Api("流程表") -public class MesRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = -7622507229961050740L; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "ROUTE_NAME") - @ApiParam("流程名称") - private String routeName; - - @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") - private Integer routeType; - - @Lob - @Column(name = "POSITION") - @ApiParam("GOJS位置") - private String position; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java deleted file mode 100644 index 556d26f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :流程工序关系 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE_PROCESS") -@Api("流程工序关系") -public class MesRouteProcess extends BaseBean implements Serializable { - private static final long serialVersionUID = 3477334942090180010L; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS") - @ApiParam("下一工序") - private String nextProcess; - - @Column(name = "REPAIR_PROCESS") - @ApiParam("维修工序") - private String repairProcess; - - @Column(name = "SEQ") - @ApiParam("顺序") - private Integer seq; - - @Column(name = "IS_NECESSARY") - @ApiParam("是否必须") - private Integer isNecessary; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - - public int getIsNecessaryVal() { - return this.isNecessary == null ? 0 : this.isNecessary; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java deleted file mode 100644 index 5907cec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工序工作单元 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE_PROCESS_CELL") -@Api("工序工作单元对照") -public class MesRouteProcessCell extends BaseBean implements Serializable { - private static final long serialVersionUID = -703779336699805482L; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java deleted file mode 100644 index a77b075..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :报废原因 - * @Reference : - * @Author : crish - * @CreateDate : 2019-08-08 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP") -@Api("报废原因") -public class MesScrap extends BaseBean implements Serializable { - private static final long serialVersionUID = -6202113707752178624L; - @Column(name = "SCRAP_CODE") - @ApiParam("报废代码") - private String scrapCode; - - @Column(name = "SCRAP_NAME") - @ApiParam("报废名称") - private String scrapName; - - @Column(name = "SCRAP_TYPE") - @ApiParam("报废类型") - private String scrapType; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java deleted file mode 100644 index 97ac5d3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:42 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("报废信息记录表") -public class MesScrapRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -8519832449647086195L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "SCRAP_CODE") - @ApiParam("报废代码") - private String scrapCode; - - @Column(name = "SCRAP_NAME") - @ApiParam("报废名称") - private String scrapName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java deleted file mode 100644 index df66c61..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : crish - * @CreateDate : 2019-04-19 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT") -@Api("班次信息") -public class MesShift extends BaseBean implements Serializable { - private static final long serialVersionUID = -1174268061355263705L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次代码") - private String shiftCode; - - @Column(name = "SHIFT_NAME") - @ApiParam("班次名称") - private String shiftName; - - @Column(name = "START_TIME") - @ApiParam("开班时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("下班时间") - private String endTime; - - @Column(name = "WORK_TIMES") - @ApiParam("作业时长") - private Double workTimes; - - @Column(name = "SHIFT_SEQ") - @ApiParam("班次顺序") - private Integer shiftSeq; - - public int getShiftSeqVal() { - return this.shiftSeq == null ? 0 : this.shiftSeq; - } - - public double getWorkTimesVal() { - return this.workTimes == null ? 0.0d : this.workTimes; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java deleted file mode 100644 index 7aac2d7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-18-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT_GROUP") -@Api("班组") -public class MesShiftGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = 8962836866086379111L; - @Column(name = "GROUP_CODE") - @ApiParam("班组代码") - private String groupCode; - - @Column(name = "GROUP_NAME") - @ApiParam("班组名称") - private String groupName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SQUAD_LEADER") - @ApiParam("班长") - private String squadLeader; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java deleted file mode 100644 index a7c1232..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : yiming.gu - * @CreateDate : 2019-05-20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT_REST") -@Api("班次休息信息") -public class MesShiftRest extends BaseBean implements Serializable { - private static final long serialVersionUID = -8712815093203320523L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次代码") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "REST_TIMES") - @ApiParam("休息时长") - private Double restTimes; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java deleted file mode 100644 index b29fae0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/18 0018 - 9:07 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SN_PHOTO_RELATION") -@Api("条码照片关系") -public class MesSnPhotoRelation extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7732648131003455681L; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("条码") - private String serialNumber; - - @Column(name = "PHOTO_PATH") - @ApiParam("照片路径") - private String photoPath; - - @Column(name = "PHOTO_NAME") - @ApiParam("照片名称") - private String photoName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java deleted file mode 100644 index b376b32..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java +++ /dev/null @@ -1,151 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault; -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.Transient; -import java.io.Serializable; - -/** - * @Description :工序物料清单 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STATION_BOM") -@Api("工序物料清单") -public class MesStationBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -4693067673094931011L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("产品物料名称") - private String partName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子零件") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("原材料物料名称") - private String itemPartName; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "子零件数量", example = "0") - private Double qty; - - @Column(name = "IS_REPEAT") - @ApiParam(value = "是否可重复") - private Integer isRepeat; - - @Column(name = "IS_CHECK") - @ApiParam(value = "是否检查") - private Integer isCheck; - - @Column(name = "IS_FEED") - @ApiParam(value = "是否投料配置") - private Integer isFeed; - - @Column(name = "IS_BIND_KEY") - @ApiParam(value = "是否绑定关键件") - private Integer isBindKey; - - @Transient - @ApiParam(value = "绑定数量") - private Double boundQty; - - @Transient - @ApiParam("是否已绑定") - private Boolean isBind; - - @Transient - @ApiParam("显示颜色") - private String color; - - @Transient - @ApiParam("关键件代码") - private String keyBarCode; - - @Transient - @ApiParam("产品条码") - private String serialNumber; - - public double getBoundQtyVal() { - return this.boundQty == null ? 0.0d : this.boundQty; - } - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getIsRepeatVal() { - return this.isRepeat == null ? 0 : this.isRepeat; - } - - public int getIsCheckVal() { - return this.isCheck == null ? 0 : this.isCheck; - } - - public boolean getIsBindVal() { - return this.isBind == null ? false : this.isBind; - } - - public int getIsFeedVal() { - return this.isFeed == null ? 0 : this.isFeed; - } - - @Override - public String toString() { - return "MesStationBom{" + - "partNo='" + partNo + '\'' + - ", itemPartNo='" + itemPartNo + '\'' + - ", qty=" + qty + - ", isRepeat=" + isRepeat + - ", isCheck=" + isCheck + - ", isFeed=" + isFeed + - ", isBind=" + isBind + - ", color='" + color + '\'' + - ", id=" + id + - ", organizeCode='" + organizeCode + '\'' + - ", isValid=" + isValid + - ", isDeleted=" + isDeleted + - ", createUser='" + createUser + '\'' + - ", createDatetime='" + createDatetime + '\'' + - ", modifyUser='" + modifyUser + '\'' + - ", modifyDatetime='" + modifyDatetime + '\'' + - ", createDateTimeStart='" + createDateTimeStart + '\'' + - ", createDateTimeEnd='" + createDateTimeEnd + '\'' + - ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' + - ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' + - ", orderByParam='" + orderByParam + '\'' + - ", ascOrDesc=" + ascOrDesc + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java deleted file mode 100644 index 0998015..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java +++ /dev/null @@ -1,102 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :工步 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STEP") -@Api("工步") -public class MesStep extends BaseBean implements Serializable { - private static final long serialVersionUID = -2157306767211269786L; - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_NAME") - @ApiParam("工步名称") - private String stepName; - - @Column(name = "STEP_TEXT") - @ApiParam("工步描述") - private String stepText; - - @Column(name = "STEP_TYPE") - @ApiParam("工步类型") - private String stepType; - - @Column(name = "STEP_OBJECT") - @ApiParam("工步对象") - private String stepObject; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("流程代码") - private String routeCode; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工序代码") - private String processCode; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工步顺序") - private Integer stepSeq; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工步执行完毕") - private boolean isComplete; - - /** - * 工位扫描业务所需使用字段 - */ - @Transient - @ApiParam("工步是否跳过") - private boolean isJump; - - public MesStep() { - } - - public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq) { - this.stepCode = stepCode; - this.stepName = stepName; - this.stepText = stepText; - this.stepType = stepType; - this.stepObject = stepObject; - this.routeCode = routeCode; - this.processCode = processCode; - this.stepSeq = stepSeq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java deleted file mode 100644 index dd5a834..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工步参数 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STEP_PARAM") -@Api("工步参数") -public class MesStepParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -147541368320233093L; - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_ATTRIBUTE") - @ApiParam("参数属性") - private String paramAttribute; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java deleted file mode 100644 index 0d30d54..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TIME") -@Api("工步参数") -public class MesTime extends BaseBean implements Serializable { - private static final long serialVersionUID = 1562011791394529076L; - - @Column(name = "MODULE") - @ApiParam("组件") - private String module; - - @Column(name = "ELAPSE") - @ApiParam("耗时") - private Long elapse; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java deleted file mode 100644 index b6071b9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :扭矩信息记录表 - * @Reference : - * @Author : Crish - * @CreateDate : 2019-05-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TORQUE_DETAIL") -@Api("扭矩信息记录表") -public class MesTorqueDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 2900363253333046861L; - - @Column(name = "SN") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "UPPER_LIMIT") - @ApiParam("最大值") - private Double upperLimit; - - @Column(name = "LOWER_LIMIT") - @ApiParam("最小值") - private Double lowerLimit; - - @Column(name = "TORQUE_DETAIL_VALUE") - @ApiParam("扭矩值") - private Double torqueValue; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "ok") - @ApiParam("扭矩是否合格") - private String ok; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "p_set") - @ApiParam("螺丝枪PSET设置值") - private String deviceSetValue; - - @Column(name = "MAXANGLE") - @ApiParam("最大扭矩") - private String maxAngle; - - @Column(name = "MINANGLE") - @ApiParam("最小扭矩") - private String minAngel; - - @Column(name = "FINALANGLE") - @ApiParam("最终扭矩") - private Integer finalAngle; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单号") - private String workOrderNo; - - @Column(name = "KEY_DATA_CODE") - @ApiParam("关键数据代码") - private String keyDataCode; - - @Column(name = "RESULT_MSG") - @ApiParam("扭矩判定结果") - private String resultMsg; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java deleted file mode 100644 index 506ed2a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\22 16:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TYPE_CFG") -@Api("类型信息表") -public class MesTypeCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -1699612238800419597L; - - @Column(name = "TYPE_CODE") - @ApiParam("类型代码") - private String typeCode; - - @Column(name = "TYPE_NAME") - @ApiParam("类型名称") - private String typeName; - - @Column(name = "BUSINESS_TYPE_CODE") - @ApiParam("业务类型代码") - private String businessTypeCode; - - @Column(name = "BUSINESS_TYPE_NAME") - @ApiParam("业务类型名称") - private String businessTypeName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java deleted file mode 100644 index a089f0a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 1:45 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK") -@Api("开线检查") -public class MesWcCheck extends BaseBean implements Serializable { - private static final long serialVersionUID = 8057329890155185557L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "CHECK_TYPE") - @ApiParam("检查类型") - private String checkType; - - @Column(name = "CHECK_OBJ") - @ApiParam("检查对象") - private String checkObj; - - @Column(name = "CHECK_ITEM") - @ApiParam("检查项") - private String checkItem; - - @Column(name = "STANDARD") - @ApiParam("检查标准") - private String standard; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java deleted file mode 100644 index fbf5699..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ /dev/null @@ -1,83 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 1:57 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("开线检查记录") -public class MesWcCheckRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2173902677953303765L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_ORDER") - @ApiParam("工单号") - private String workOrder; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "CHECK_TYPE") - @ApiParam("检查类型") - private String checkType; - - @Column(name = "CHECK_OBJ") - @ApiParam("检查对象") - private String checkObj; - - @Column(name = "CHECK_ITEM") - @ApiParam("检查项") - private String checkItem; - - @Column(name = "STANDARD") - @ApiParam("检查标准") - private String standard; - - @Column(name = "CHECK_RESULT") - @ApiParam("检查结果") - private String checkResult; - - @Column(name = "CHECK_VALUE") - @ApiParam("检查值") - private String checkValue; - - @Column(name = "REASON") - @ApiParam("原因") - private String reason; - - @Column(name = "GROUP_CODE") - @ApiParam("组名") - private String groupCode; - - @Column(name = "OVERALL_RESULT") - @ApiParam("总体结果") - private Integer overAllResult; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java deleted file mode 100644 index feeef17..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 2:31 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_EQUIPMENT") -@Api("工作单元设备关系表") -public class MesWcEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 2088600237918553286L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java deleted file mode 100644 index e9bd56b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工作单元 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL") -@Api("工作单元") -public class MesWorkCell extends BaseBean implements Serializable { - private static final long serialVersionUID = -493313481197504121L; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "WORK_CELL_NAME") - @ApiParam("工作单元名称") - private String workCellName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("生产区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_TYPE") - @ApiParam("工位类型") - private Integer workCellType; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - @Column(name = "WORK_CELL_IP") - @ApiParam("工作单元IP") - private String workCellIp; - - @Column(name = "WORK_CELL_PORT") - @ApiParam("工作单元端口") - private String workCellPort; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java deleted file mode 100644 index 2200ceb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/16 2:42 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("工位监控异常信息") -public class MesWorkCellMonitorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -5634446206963213556L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单") - private String workOrderNo; - - @Column(name = "STEP_CODE") - @ApiParam("工步") - private String stepCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序") - private String processCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程") - private String routeCOde; - - @Lob - @Column(name = "MESSAGE") - @ApiParam("异常信息") - private String message; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java deleted file mode 100644 index 2249726..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工作单元参数 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-30 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_PARAM") -@Api("mes工作单元参数") -public class MesWorkCellParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -3659425774085368499L; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_TYPE") - @ApiParam("参数类型") - private Integer paramType; - - @Column(name = "PARAM_MODEL") - @ApiParam("参数模式") - private Integer paramModel; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java deleted file mode 100644 index a434107..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工作单元参数配置 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_PARAM_CFG") -@Api("工作单元参数配置") -public class MesWorkCellParamCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 1739991089354361293L; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_VALUE") - @ApiParam("参数值") - private String paramValue; - - @Column(name = "IS_CHECK") - @ApiParam("是否必须校验") - private Integer isCheck; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java deleted file mode 100644 index 0329add..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description : 工站队列 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-22 17:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_POINT") -@Api("工站队列") -public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = 2881841596678871526L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "QUEUE_SEQ") - @ApiParam("队列主表序号") - private Double queueSeq; - - @Column(name = "QUEUE_DETAIL_SEQ") - @ApiParam("队列明细表序号") - private Double queueDetailSeq; - - public double getQueueSeqVal() { - return this.queueSeq == null ? 0 : this.queueSeq; - } - - public double getQueueDetailSeqVal() { - return this.queueDetailSeq == null ? 0 : this.queueDetailSeq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java deleted file mode 100644 index 5932327..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :配置表 - * @Reference : - * @Author : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_STATUS") -@Api("工位运行状态") -public class MesWorkCellStatus extends BaseBean implements Serializable { - private static final long serialVersionUID = 102975351699481524L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "TIME_OUT_STATUS") - @ApiParam("超时状态") - private Integer timeOutStatus; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java deleted file mode 100644 index 3d35275..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :工作中心 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CENTER") -@Api("工作中心") -public class MesWorkCenter extends BaseBean implements Serializable { - private static final long serialVersionUID = -1119897685621371682L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "ERP_WORK_CENTER") - @ApiParam("ERP工作中心") - private String erpWorkCenter; - - @Column(name = "WORK_VER") - @ApiParam("工作版本") - private String workVer; - - @Column(name = "AREA_CODE") - @ApiParam("生产区域代码") - private String areaCode; - - @Column(name = "RUNNING_STATUS") - @ApiParam("运行状态") - private String runningStatus; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java deleted file mode 100644 index c4443eb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ /dev/null @@ -1,249 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.pcn.model.MesButtonFlagModel; -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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) -}) -@Api("生产工单") -public class MesWorkOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 8065877030194822855L; - - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("工单号") - private String orderNo; - - @Column(name = "PART_NO", nullable = false) - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "COMPLETE_QTY") - @ApiParam("完成数量") - private Double completeQty; - - @Column(name = "REPAIR_QTY") - @ApiParam("返修数量") - private Double repairQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数量") - private Double scrapQty; - - @Column(name = "SEQ") - @ApiParam("工单序号") - private Double seq; - - @Column(name = "WO_STATUS") - @ApiParam("工单状态") - private Integer workOrderStatus; - - @Column(name = "WO_TYPE") - @ApiParam("工单类型") - private Integer workOrderType; - - @Column(name = "NEXT_ORDER") - @ApiParam("下一工单") - private String nextOrder; - - @Column(name = "PLAN_ORDER_NO") - @ApiParam("生产计划单号") - private String planOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "SCHEDULE_DATE") - @ApiParam("排产日期") - private String scheduleDate; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("结束时间") - private String endTime; - - @Column(name = "WO_SOURCE") - @ApiParam("工单来源") - private String workOrderSource; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "SHIFT_GROUP") - @ApiParam("班组") - private String shiftGroup; - - @Column(name = "APPROVAL_STATUS") - @ApiParam("审批状态") - private Integer approvalStatus; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; - - @Column(name = "FI_COMPLETE_QTY") - @ApiParam("首检完成数量") - private Double fiCompleteQty; - - @Column(name = "FI_GENERATE_QTY") - @ApiParam("首检生成数量") - private Double fiGenerateQty; - - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; - - /********************** 冗余字段 *********************************/ - @Transient - @ApiParam(value = "工作中心名称") - public String workCenterName; - - @Transient - @ApiParam(value = "工作单元名称") - public String workCellName; - - @Transient - @ApiParam(value = "客户产线名称") - public String custProdLineName; - - @Transient - @ApiParam(value = "班次名称") - public String shiftName; - - @Transient - @ApiParam(value = "班组名称") - public String shiftGroupName; - - @Transient - @ApiParam(value = "产品配置名称") - public String prodCfgName; - - @Transient - @ApiParam("区域代码名称") - private String areaCodeName; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - @Transient - @ApiParam("mes生产工单页面按钮控制") - private MesButtonFlagModel mesButtonFlagModel; - - @Transient - @ApiParam("批量打包开窗页面查询工单=1") - private String pageType; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getCompleteQtyVal() { - return this.completeQty == null ? 0.0d : this.completeQty; - } - - public double getRepairQtyVal() { - return this.repairQty == null ? 0.0d : this.repairQty; - } - - public double getScrapQtyVal() { - return this.scrapQty == null ? 0.0d : this.scrapQty; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public int getWorkOrderStatusVal() { - return this.workOrderStatus == null ? 0 : this.workOrderStatus; - } - - public int getWorkOrderTypeVal() { - return this.workOrderType == null ? 0 : this.workOrderType; - } - - public int getApprovalStatusVal() { - return this.approvalStatus == null ? 0 : this.approvalStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java deleted file mode 100644 index caba23a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ /dev/null @@ -1,231 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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: wangjie - * @CreateDate:2019-09-19-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG", indexes = { - @Index(columnList = "ORDER_NO"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("生产工单日志") -public class MesWorkOrderLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -7018645997937147427L; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "COMPLETE_QTY") - @ApiParam("完成数量") - private Double completeQty; - - @Column(name = "REPAIR_QTY") - @ApiParam("返修数量") - private Double repairQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数量") - private Double scrapQty; - - @Column(name = "SEQ") - @ApiParam("工单序号") - private Double seq; - - @Column(name = "WO_STATUS") - @ApiParam("工单状态") - private Integer workOrderStatus; - - @Column(name = "WO_TYPE") - @ApiParam("工单类型") - private Integer workOrderType; - - @Column(name = "NEXT_ORDER") - @ApiParam("下一工单") - private String nextOrder; - - @Column(name = "PLAN_ORDER_NO") - @ApiParam("生产计划单号") - private String planOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "SCHEDULE_DATE") - @ApiParam("排产日期") - private String scheduleDate; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("结束时间") - private String endTime; - - @Column(name = "WO_SOURCE") - @ApiParam("工单来源") - private String workOrderSource; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "SHIFT_GROUP") - @ApiParam("班组") - private String shiftGroup; - - @Column(name = "APPROVAL_STATUS") - @ApiParam("审批状态") - private Integer approvalStatus; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; - - @Column(name = "FI_COMPLETE_QTY") - @ApiParam("首检完成数量") - private Double fiCompleteQty; - - @Column(name = "FI_GENERATE_QTY") - @ApiParam("首检生成数量") - private Double fiGenerateQty; - - /********************** 冗余字段 *********************************/ - @Transient - @ApiParam(value = "工作中心名称") - public String workCenterName; - - @Transient - @ApiParam(value = "工作单元名称") - public String workCellName; - - @Transient - @ApiParam(value = "客户产线名称") - public String custProdLineName; - - @Transient - @ApiParam(value = "班次名称") - public String shiftName; - - @Transient - @ApiParam(value = "班组名称") - public String shiftGroupName; - - @Transient - @ApiParam(value = "产品配置名称") - public String prodCfgName; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getCompleteQtyVal() { - return this.completeQty == null ? 0.0d : this.completeQty; - } - - public double getRepairQtyVal() { - return this.repairQty == null ? 0.0d : this.repairQty; - } - - public double getScrapQtyVal() { - return this.scrapQty == null ? 0.0d : this.scrapQty; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public int getWorkOrderStatusVal() { - return this.workOrderStatus == null ? 0 : this.workOrderStatus; - } - - public int getWorkOrderTypeVal() { - return this.workOrderType == null ? 0 : this.workOrderType; - } - - public int getApprovalStatusVal() { - return this.approvalStatus == null ? 0 : this.approvalStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java deleted file mode 100644 index 3306bbf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Description : 动作请求参数 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -public class ActionRequestBean implements Serializable { - - @ApiParam("事件代码") - @Deprecated - public String eventCode; - - @ApiParam("按钮代码") - public String buttonCode; - - @ApiParam("单个结果") - public Obj resultObject; - - @ApiParam("List请求集") - public List resultList; - - @ApiParam("Map请求集") - public Map resultMap; - - @ApiParam("目的状态") - private Integer destStatus; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java deleted file mode 100644 index bfdcf1f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class AttrBean implements Serializable { - - @ApiParam("属性名称") - private String attrName; - - @ApiParam("属性名称别名") - private String attrNameAlias; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java deleted file mode 100644 index 5919ee5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class ButtonBean implements Serializable { - @ApiParam(value = "按钮代码") - private String buttonCode; - - @ApiParam(value = "按钮名称") - private String buttonName; - - // 执行类方法,sql,或者标记 - @ApiParam(value = "执行内容") - private String methodContent; - - @ApiParam(value = "按钮描述") - private String buttonDesc; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java deleted file mode 100644 index f70aaaa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/10 0010 - 15:28 - */ -@Data -@Api("数据采集Model") -public class DataAcquisitionModel { - - @ApiParam("对象代码") - private String objectCode; - - @ApiParam("对象名称") - private String objectName; - - @ApiParam("字段代码") - private String fieldCode; - - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("字段值") - private String fieldValue; -// -// @ApiParam("组号") -// private String groupNo; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java deleted file mode 100644 index f88ae24..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\28 19:50 - * @Modify: - **/ -@Data -public class DefectModel { - - private Long id; - - @ApiParam("缺陷代码") - private String defectCode; - - @ApiParam("缺陷名称") - private String defectName; - - @ApiParam("缺陷类型") - private String defectType; - - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @ApiParam("缺陷位置") - private String defectLocation; - - @ApiParam("缺陷类型子集") - private List mesDefectList; - - public DefectModel() { - - } - - public DefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) { - this.id = id; - this.defectCode = defectCode; - this.defectName = defectName; - this.defectType = defectType; - this.defectTypeName = defectTypeName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java deleted file mode 100644 index ac086ba..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/12/4 3:09 下午 - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("FastDfs文件model") -public class EsopFileModel { - - private MesEsop esop; - - private MesFile file; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java deleted file mode 100644 index 418ab92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/19 7:00 PM - * @Description: - **/ - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("FastDfs文件model") -public class FastDfsDownloadModel { - - @ApiParam("部分相对路径") - private String dirPath; - - @ApiParam("文件名称") - private String fileName; - - @ApiParam("文件字节") - private byte[] fileByte; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java deleted file mode 100644 index fd91386..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 11:42 AM - * @Description: - **/ - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("生成条码模型") -public class GenSerialNoModel { - - @ApiParam("规则代码") - private String ruleCode; - - @ApiParam("规则描述") - private String ruleDesc; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("客户物料号") - private String custPartNo; - - @ApiParam("客户代码") - private String custCode; - - @ApiParam("过程条码") - private String serialNumber; - - @ApiParam("产地") - private String prodLocation; - - @ApiParam("前缀") - private String prefix; - - @ApiParam("编码规则") - private String numberRule; - - @ApiParam("序号长度") - private Integer serialnoLength; - - @ApiParam("增量") - private Integer serialnoIncrement; - - @ApiParam("最大值后循环") - private Integer isCycle; - - @ApiParam("当前编号前缀") - private String currentNumberPrefix; - - @ApiParam("当前序号") - private Integer currentSerialno; - - @ApiParam("当前编号") - private String currentNumber; - - - public GenSerialNoModel(String ruleCode) { - this.ruleCode = ruleCode; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java deleted file mode 100644 index 7883204..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Author: wangjie - * @CreateDate: 2019/8/21 9:19 AM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("mes页面按钮控制model") -public class MesButtonFlagModel implements Serializable { - - @ApiParam("修改按钮") - private boolean updateButton; - - @ApiParam("按配置修改按钮") - private boolean updateButtonConfig; - - @ApiParam("下达按钮") - private boolean transmitButton; - -// @ApiParam("测试动态下达按钮") -// private boolean dynamicTransmitButtonTest; - - @ApiParam("启动按钮") - private boolean startUpButton; - - @ApiParam("暂停按钮") - private boolean suspendButton; - - @ApiParam("取消按钮") - private boolean revokeButton; - - @ApiParam("关闭按钮") - private boolean closeButton; - - @ApiParam("完成按钮") - private boolean completeButton; - - @ApiParam("关闭按钮-提醒") - private boolean closeButtonNoticeFlag; - - @ApiParam("维修任务按钮") - private boolean repairButton; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java deleted file mode 100644 index 57ba538..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Transient; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:04 - * @Modify: - **/ -@Data -public class MesDefectModel { - - private String defectCode; - - @ApiParam("缺陷名称") - private String defectName; - - @ApiParam("缺陷类型") - private String defectType; - - @Transient - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @Transient - @ApiParam("缺陷分类子集") - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java deleted file mode 100644 index 7bad5fc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ /dev/null @@ -1,126 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:05 - * @Modify: - **/ -@Data -public class MesProdBindRecordModel { - private Long id; - private String itemPartNo; - private String itemPartName; - private Double qty; - private Integer isValid; - private Integer isDeleted; - private String organizeCode; - private Integer isFeed; - private String workCenterCode; - private String workCellCode; - private String kpSn; - @ApiParam("拆解数") - private Double dismantleQty; - - @ApiParam("产品物料编码") - private String parentPartNo; - @ApiParam("产品物料名称") - private String parentPartName; - @ApiParam("合格数") - private Integer okQty; - @ApiParam("缺失数") - private Integer missQty; - @ApiParam("报废数") - private Integer scrapQty; - @ApiParam("创建时间") - private String createUser; - @ApiParam("创建时间") - private String createDatetime; - @ApiParam("修改人") - private String modifyUser; - @ApiParam("修改时间") - private String modifyDatetime; - @ApiParam("产品条码") - private String serialNumber; - @ApiParam("关联批次") - private String lotNo; - - public MesProdBindRecordModel() { - - } - - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - this.dismantleQty = dismantleQty; - this.lotNo = lotNo; - } - - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String lotNo) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - this.lotNo = lotNo; - } - - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyUser = modifyUser; - this.modifyDatetime = modifyDatetime; - this.serialNumber = serialNumber; - this.lotNo = lotNo; - } - - public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) { - this.itemPartNo = itemPartNo; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.kpSn = kpSn; - this.parentPartNo = parentPartNo; - this.serialNumber = serialNumber; - this.lotNo = lotNo; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java deleted file mode 100644 index e6504ec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java +++ /dev/null @@ -1,75 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:04 - * @Modify: - **/ -@Data -public class MesStationBomModel { - - private Long id; - @ApiParam("子物料编码") - private String itemPartNo; - @ApiParam("子物料名称") - private String itemPartName; - @ApiParam("产品数量") - private Double qty; - private Integer isValid; - private Integer isDeleted; - private String organizeCode; - private Integer isFeed; - private String workCenterCode; - private String workCellCode; - @ApiParam("拆解数") - private Double dismantleQty; - - @ApiParam("产品物料编码") - private String parentPartNo; - @ApiParam("产品物料名称") - private String parentPartName; - @ApiParam("合格数") - private Integer okQty; - @ApiParam("缺失数") - private Integer missQty; - @ApiParam("报废数") - private Integer scrapQty; - - public MesStationBomModel() { - - } - - public MesStationBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { - this.id = id; - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - } - - public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { - this.itemPartNo = itemPartNo; - this.itemPartName = itemPartName; - this.qty = qty; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.organizeCode = organizeCode; - this.isFeed = isFeed; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.parentPartNo = parentPartNo; - this.parentPartName = parentPartName; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java deleted file mode 100644 index f3b4227..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Map; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/25 7:41 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("PLC交互model") -public class PLCInteracticeModel { - - private String serverIp; - - private String serverPort; - - private String mwContext; - - private String protocol; - - private String plcCode; - - private String dataType; - - private String userName; - - private String password; - - private Integer enabled; - - private String realm; - - private String tag; - - private String value; - - private String comment; - - private String authenKey; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java deleted file mode 100644 index ed2bc6c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author Wynne.Lu - * @date 2020/2/21 17:20 - * @desc - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("工位监控观察者对象") -public class PcsObserverStatusModel { - - @ApiParam("产线") - private String workCenterCode; - - @ApiParam("运行状况") - private Boolean runningStatus; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java deleted file mode 100644 index ba753cc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @Author: wangjie - * @CreateDate: 2019/9/23 8:06 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("产品包装model") -public class ProdPackageModel { - - @ApiParam("工单号") - private String workOrderNo; - - @ApiParam("生产线") - private String workCenterCode; - - @ApiParam("客户代码") - private String custCode; - - @ApiParam("班次") - private String shiftCode; - - @ApiParam("班次名称") - private String shiftName; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("单位") - private String unit; - - @ApiParam("工单数量") - private Double workOrderQty; - - @ApiParam("完成数量") - private Double completeQty; - - @ApiParam("包装规格数量") - private Double packSpecQty; - - @ApiParam("包装规格") - private String packSpec; - - @ApiParam("数量") - private Double qty; - - @ApiParam("特殊批次") - private String fixLotNo; - - @ApiParam("包装集合") - private List packageList; - - @ApiParam("打印状态文字") - private String printStrStatus; - - @ApiParam("包装层级名称") - private String packLevelName; - - @ApiParam("是否封箱名称") - private String isSealedName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java deleted file mode 100644 index 727e482..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("产品包装model") -public class ProductDataModel { - - @ApiParam("字段代码") - private String fieldCode; - - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("字段值") - private String fieldValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java deleted file mode 100644 index f2ec4a3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2020\1\13 17:23 - * @Modify: - **/ -@Data -public class QcCheckStandardModel { - - private Long id; - - @ApiParam("列头") - private String title; - - private List resultList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java deleted file mode 100644 index bdb5567..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class QueueJisModel implements Serializable { - - @ApiParam("主队列编号") - private String jisNo; - - @ApiParam("vin") - private String vinCode; - - @ApiParam("车号") - private String carNo; - - @ApiParam("排序") - private Double seq; - - @ApiParam("状态") - private Integer status; - - @ApiParam("产品配置代码") - private String prodCfgCode; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @ApiParam("明细状态") - private Integer detailStatus; - - @ApiParam("产品条码") - private String serialNumber; - - @ApiParam("明细整体状态") - private Integer finalStatus; - - @ApiParam("状态名称") - private String statusName; - - @ApiParam("明细状态名称") - private String detailStatusName; - - @ApiParam("明细整体状态名称") - private String finalStatusName; - - @ApiParam("颜色") - private String color; - - public String getStatusName() { - return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); - } - - public String getDetailStatusName() { - return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); - } - - public String getFinalStatusName() { - return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); - } - - public QueueJisModel() { - } - - public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { - this.jisNo = jisNo; - this.vinCode = vinCode; - this.carNo = carNo; - this.seq = seq; - this.status = status; - this.prodCfgCode = prodCfgCode; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.produceCategoryCode = produceCategoryCode; - this.detailStatus = detailStatus; - this.serialNumber = serialNumber; - this.finalStatus = finalStatus; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java deleted file mode 100644 index 1a7965e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ /dev/null @@ -1,83 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description : JIT队列列表Model - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-22 16:34 - * @Modify: - **/ -@Data -@Api("JIT队列列表Model") -public class QueueOrderModel implements Serializable { - private Long id; - @ApiParam("队列序号") - public Double queueSeq; - @ApiParam("队列明细序号") - public Double queDetailSeq; - @ApiParam("客户标识号") - public String custFlagNo; - @ApiParam("产品配置名称") - public String prodCfgNameRdd; - @ApiParam("产品类型名称") - public String categoryNameRdd; - @ApiParam("产品条码") - public String serialNumber; - @ApiParam("物料号") - public String partNo; - @ApiParam("物料名称") - public String partNameRdd; - @ApiParam("条码状态") - public Integer snStatus; - @ApiParam("生产类型") - public String workType; - @Transient - @ApiParam("显示颜色") - private String color; - @ApiParam("工厂代码") - private String organizeCode; - @ApiParam("展示行数") - private Integer prodNum; - @ApiParam("产线") - private String workCenterCode; - @ApiParam("工位") - private String workCellCode; - - public QueueOrderModel() { - } - - public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { - this.id = id; - this.queueSeq = queueSeq; - this.queDetailSeq = queDetailSeq; - this.custFlagNo = custFlagNo; - this.prodCfgNameRdd = prodCfgNameRdd; - this.categoryNameRdd = categoryNameRdd; - this.serialNumber = serialNumber; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.snStatus = snStatus; - this.workType = workType; - } - - public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType) { - this.id = id; - this.queueSeq = queueSeq; - this.queDetailSeq = queDetailSeq; - this.custFlagNo = custFlagNo; - this.prodCfgNameRdd = prodCfgNameRdd; - this.categoryNameRdd = categoryNameRdd; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.workType = workType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java deleted file mode 100644 index 6a85e20..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java +++ /dev/null @@ -1,155 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.*; - -import java.util.List; - -/** - * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-29-11:58 - * @Modify: - **/ -public class RequestModel { - - private List mesDefectRecordList; // 不良/缺陷记录数据集 - - private List mesRepairRecordList; // 维修记录数据集 - - private List dismantleRecordList; // 拆解记录数据集 - - private List workOrderList; // 工单数据集 - - private List partList; // 物料数据集 - - private List queueOrderList; // 生产队列数据集 - - private Double currentSeq; // 生产队列中的当前序列号 - - private Double nextSeq; // 生产队列中的下一个序列号 - - private Integer srcStatus; // 源状态 - - private Integer destStatus; // 目的状态 - - private List orderNoList;//工单编号 - - private ActionRequestBean actionRequestBean;//工单状态 - - public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { - this.queueOrderList = queueOrderList; - this.currentSeq = currentSeq; - this.nextSeq = nextSeq; - } - - public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { - this.queueOrderList = queueOrderList; - this.srcStatus = srcStatus; - this.destStatus = destStatus; - } - - public RequestModel(List workOrderList, List partList) { - this.workOrderList = workOrderList; - this.partList = partList; - } - - public List getMesDefectRecordList() { - return mesDefectRecordList; - } - - public void setMesDefectRecordList(List mesDefectRecordList) { - this.mesDefectRecordList = mesDefectRecordList; - } - - public List getMesRepairRecordList() { - return mesRepairRecordList; - } - - public void setMesRepairRecordList(List mesRepairRecordList) { - this.mesRepairRecordList = mesRepairRecordList; - } - - public List getDismantleRecordList() { - return dismantleRecordList; - } - - public void setDismantleRecordList(List dismantleRecordList) { - this.dismantleRecordList = dismantleRecordList; - } - - public List getWorkOrderList() { - return workOrderList; - } - - public RequestModel() { - } - - public void setWorkOrderList(List workOrderList) { - this.workOrderList = workOrderList; - } - - public List getPartList() { - return partList; - } - - public void setPartList(List partList) { - this.partList = partList; - } - - public List getQueueOrderList() { - return queueOrderList; - } - - public void setQueueOrderList(List queueOrderList) { - this.queueOrderList = queueOrderList; - } - - public void setOrderNoList(List orderNoList) { - this.orderNoList = orderNoList; - } - - public List getOrderNoList() { - return orderNoList; - } - - public void setActionRequestBean(ActionRequestBean actionRequestBean) { - this.actionRequestBean = actionRequestBean; - } - - public ActionRequestBean getActionRequestBean() { - return actionRequestBean; - } - - public Double getCurrentSeq() { - return currentSeq == null ? 0.0d : currentSeq; - } - - public void setCurrentSeq(Double currentSeq) { - this.currentSeq = currentSeq; - } - - public Double getNextSeq() { - return nextSeq == null ? 0.0d : nextSeq; - } - - public void setNextSeq(Double nextSeq) { - this.nextSeq = nextSeq; - } - - public Integer getSrcStatus() { - return srcStatus == null ? 0 : srcStatus; - } - - public void setSrcStatus(Integer srcStatus) { - this.srcStatus = srcStatus; - } - - public Integer getDestStatus() { - return destStatus == null ? 0 : destStatus; - } - - public void setDestStatus(Integer destStatus) { - this.destStatus = destStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java deleted file mode 100644 index 831a997..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description: 打印信息封装 - * @Reference: - * @Author: wangjie - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息封装") -public class SnPrintDataModel { - - @ApiParam("打印数据") - private List valueList; - - @ApiParam("打印模板及参数") - private MesLabelTemplate labelTemplate; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java deleted file mode 100644 index 0f1d4a6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: 打印信息汇总 - * @Reference: - * @Author: wangjie - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息汇总") -public class SnPrintModel extends StepPrintSnModel { - - @ApiParam("过程条码") - private SnPrintDataModel serialPrintDataModel; - - @ApiParam("产品条码") - private SnPrintDataModel prodPrintDataModel; - - @ApiParam("包装条码") - private SnPrintDataModel packPrintDataModel; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java deleted file mode 100644 index e894595..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 3:11 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("工位BOM model") -public class StationBomModel extends MesStationBom { - - @ApiParam("上料数量") - private Long cellFeedQty; - - @ApiParam("是否上料数量满足") - private Boolean isFeedSatisfied; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java deleted file mode 100644 index 978fd4b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Description : 工位结果bean - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-24 - * @Modify: - **/ -@Data -public class StationResultBean implements Serializable { - - /** - * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 - * moduleContent组件内容,taskComplete整个扫描完成 - */ - @ApiParam("业务类型") - private String busiType; - - /** - * 对于相同业务类型的数据，区分不同数据类型。 - * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， - * image-图片 - */ - @ApiParam("数据类型") - private String dataType; - - @ApiParam("执行结果信息") - private String message; - - @ApiParam("List结果集") - private List resultList; - - @ApiParam("结果对象") - private Object resultObj; - - @ApiParam("Map结果集") - public Map resultMap; - - @ApiParam("List结果集的属性") - private List dataAttrList; - - @ApiParam("图片路径") - private String imageUrl; - - @ApiParam("多个数据集") - private List> stationResultBeans; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java deleted file mode 100644 index 7b2296f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/11/12 3:50 下午 - * @Description: 下拉工步参数对象 - **/ -@Data -@Api("下拉工步参数对象") -public class StepParamsModel implements Serializable { - private static final long serialVersionUID = -6361645141217616499L; - - @ApiParam("参数代码") - private String paramCode; - - @ApiParam("参数代码") - private Map paramValues; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java deleted file mode 100644 index c7f4937..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.beans.Transient; -import java.util.List; - -/** - * @Description: 打印条码工步， 打印信息模板 - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息模板") -public class StepPrintSnModel extends MesProduceSn { - @ApiParam("打印描述") - private String printDesc; - - @ApiParam("条码") - private String barCode; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("批次号") - private String batchNo; - - @ApiParam("箱数量") - private String boxQty; - - @ApiParam("订单号") - private String orderNo; - - @ApiParam("生产日期") - private String productionTime; - - @ApiParam("包装编码") - private String packageNo; - - @ApiParam("包装规格") - private String packageSpec; - - @ApiParam("供应商") - private String supplier; - - @ApiParam("客户名称") - private String customerName; - - @ApiParam("客户零件号") - private String customerPartNo; - - @ApiParam("客户物料名称") - private String customerPartName; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("单位") - private String unit; - - @ApiParam("特殊批号") - private String fixLotNo; - - @ApiParam("生产工单号") - private String workOrderNo; - - @ApiParam("生产线代码") - private String workCenterCode; - - @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") - private Integer packLevel; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java deleted file mode 100644 index 0ef0670..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import lombok.Data; - -import java.util.Collection; - -@Data -@Api("工步返回信息") -public class StepResult { - - private boolean isCompleted; - - private T data; - - private Collection dataCollection; - - private String msg; - - public static StepResult getSuccessComplete() { - return new StepResult(true, ""); - } - - public static StepResult getNonComplete() { - return new StepResult(false, ""); - } - - public static StepResult getSuccessComplete(String msg) { - return new StepResult(true, msg); - } - - public static StepResult getNonComplete(String msg) { - return new StepResult(false, msg); - } - - public static StepResult getSuccessData(T data, String msg) { - return new StepResult<>(true, data, msg); - } - - public static StepResult getSuccessData(Collection data, String msg) { - return new StepResult(true, data, msg); - } - - private StepResult() { - } - - private StepResult(boolean isCompleted) { - this.isCompleted = isCompleted; - } - - private StepResult(boolean isCompleted, String msg) { - this.isCompleted = isCompleted; - this.msg = msg; - } - - public StepResult(boolean isCompleted, T data, String msg) { - this.isCompleted = isCompleted; - this.data = data; - this.msg = msg; - } - - public StepResult(boolean isCompleted, Collection dataCollection, String msg) { - this.isCompleted = isCompleted; - this.dataCollection = dataCollection; - this.msg = msg; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java deleted file mode 100644 index ad0541e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-06-03-11:44 - * @Modify: - **/ - -public class TorqueModel { - private Long id; - - private Double upperLimit; - - private Double lowerLimit; - - private Double torqueValue; - - private boolean ok; - - private String color; - - public boolean isOk() { - return ok; - } - - public void setOk(boolean ok) { - this.ok = ok; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Double getUpperLimit() { - return upperLimit; - } - - public void setUpperLimit(Double upperLimit) { - this.upperLimit = (upperLimit == null ? 0 : upperLimit); - } - - public Double getLowerLimit() { - return lowerLimit; - } - - public void setLowerLimit(Double lowerLimit) { - this.lowerLimit = (lowerLimit == null ? 0 : lowerLimit); - } - - public Double getTorqueValue() { - return torqueValue; - } - - public void setTorqueValue(Double torqueValue) { - this.torqueValue = (torqueValue == null ? 0 : torqueValue); - } - - public String getColor() { - return color; - } - - public void setColor(String color) { - this.color = color; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java deleted file mode 100644 index e1e1c93..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.*; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 8:06 PM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("开线管控model") -public class WcCheckModel { - - @ApiParam("工作中心") - private String workCenterCode; - - @ApiParam("工单") - private String workOrder; - - @ApiParam("产品号") - private String partNo; - - @ApiParam("是否通过") - private Integer isPass; - - @ApiParam("开线信号") - private Integer onlineSignal; - - @ApiParam("开线对象") - MesWcCheckRecord onlineSignalEqu; - - @ApiParam("需要展示的数据") - private Map titleMap; - - @ApiParam("对象list和列关系") - private Map> dataColumnRelation; - - @ApiParam("重构map") - private Map> dataMap; - - public WcCheckModel initialWcCheckModel() { - WcCheckModel wcCheckModel = new WcCheckModel(); - wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); - wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); - onlineSignalEqu = new MesWcCheckRecord(); - wcCheckModel.setTitleMap(new LinkedHashMap<>()); - wcCheckModel.setDataMap(new LinkedHashMap<>()); - wcCheckModel.setDataColumnRelation(new LinkedHashMap<>()); - return wcCheckModel; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java deleted file mode 100644 index 02bca6e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.IfDismantleRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 14:14 - * @Modify: - **/ -public interface IfDismantleRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java deleted file mode 100644 index 9a4d6be..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.IfPackageDetail; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 17:47 - * @Modify: - **/ -public interface IfPackageDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java deleted file mode 100644 index 9d362f1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.IfProductOffLine; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 17:48 - * @Modify: - **/ -public interface IfProductOffLineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java deleted file mode 100644 index 5f1dbef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionIf; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 11:21 - * @Modify: - **/ -public interface MesActionIfRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java deleted file mode 100644 index d5e2954..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionMethod; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesActionMethodRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java deleted file mode 100644 index 80cb307..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesAction; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesActionRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java deleted file mode 100644 index c91b713..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesAreaRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java deleted file mode 100644 index 42b5b30..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesBomRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java deleted file mode 100644 index 6153d23..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeedRecord; - -/** - * @Description : 工位投料履历持久化类 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2020-06-17 09:53 - * @Modify: - **/ -public interface MesCellFeedRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java deleted file mode 100644 index 462dff4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/18 10:05 AM - * @Description: - **/ -@Repository -public interface MesCellFeedRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java deleted file mode 100644 index 6b43fa6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Repository -public interface MesConfigRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java deleted file mode 100644 index cbca918..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustProdLine; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-19-11:15 - * @Modify: - **/ -@Repository -public interface MesCustProdLineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java deleted file mode 100644 index 72e72bc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomerPart; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-20 - * @Modify: - **/ -@Repository -public interface MesCustomerPartRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java deleted file mode 100644 index c006be6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomer; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-22-16:12 - * @Modify: - **/ -@Repository -public interface MesCustomerRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java deleted file mode 100644 index d285a59..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDataObject; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:59 PM - * @Description: - **/ -public interface MesDataObjectRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java deleted file mode 100644 index 36faed5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:58 PM - * @Description: - **/ -public interface MesDatasourceRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java deleted file mode 100644 index c0ecd89..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectCause; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:04 - * @Modify: - **/ -public interface MesDefectCauseRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java deleted file mode 100644 index c8a7a7b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:05 - * @Modify: - **/ -public interface MesDefectRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java deleted file mode 100644 index 274f334..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:04 - * @Modify: - **/ -public interface MesDefectRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java deleted file mode 100644 index e093fe2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDismantleRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:06 - * @Modify: - **/ -public interface MesDismantleRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java deleted file mode 100644 index 9d54073..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEquipment; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEquipmentRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java deleted file mode 100644 index 103e176..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesEsopRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java deleted file mode 100644 index 6b15531..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEventAction; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEventActionRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java deleted file mode 100644 index cfa330f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEvent; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEventRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java deleted file mode 100644 index 0050530..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFiCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesFiCfgRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java deleted file mode 100644 index 16383bc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesFileRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java deleted file mode 100644 index da57b4f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : crish - * @CreateDate : 2019-05-15 - * @Modify: - **/ -@Repository -public interface MesKpDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java deleted file mode 100644 index 373ab6d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpsnRule; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesKpsnRuleRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java deleted file mode 100644 index ce73083..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : - **/ -public interface MesLabelTemplateParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java deleted file mode 100644 index 16f04a4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : - **/ -public interface MesLabelTemplateRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java deleted file mode 100644 index d064c63..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMethod; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesMethodRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java deleted file mode 100644 index 46e8f5d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTaskDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 18:42 - */ -@Repository -public interface MesMonitorTaskDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java deleted file mode 100644 index 95eb821..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTask; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 18:43 - */ -@Repository -public interface MesMonitorTaskRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java deleted file mode 100644 index d3b014d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberRule; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 1:22 PM - * @Description: - **/ -@Repository -public interface MesNumberRuleRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java deleted file mode 100644 index 11299b0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberSerialno; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 1:23 PM - * @Description: - **/ - -@Repository -public interface MesNumberSerialnoRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java deleted file mode 100644 index c1a67b2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:59 PM - * @Description: - **/ -public interface MesObjectCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java deleted file mode 100644 index d10efa8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPLCConfigure; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPLCConfigureRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java deleted file mode 100644 index fc409e1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackSpec; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPackSpecRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java deleted file mode 100644 index 6d2fe27..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 10:33 上午 - * @Description: - **/ -public interface MesPackageDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java deleted file mode 100644 index eb7c894..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 10:39 上午 - * @Description: - **/ -public interface MesPackageRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java deleted file mode 100644 index dde5b62..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageTravel; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 2:57 下午 - * @Description: - **/ -public interface MesPackageTravelRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java deleted file mode 100644 index eb12a69..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPartCategory; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPartCategoryRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java deleted file mode 100644 index 0324dd1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPartRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java deleted file mode 100644 index 87029c6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesPatternJisRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java deleted file mode 100644 index c9e3e97..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnConnectLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnConnectLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java deleted file mode 100644 index 1ae09bf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcn; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java deleted file mode 100644 index 256e8da..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnSyncCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java deleted file mode 100644 index a217480..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncErrorLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnSyncErrorLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java deleted file mode 100644 index 111a055..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSysUserOffline; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-09-02 - * @Modify: - **/ -@Repository -public interface MesPcnSysUserOfflineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java deleted file mode 100644 index 66621f9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTaskLog; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-27 - * @Modify: - **/ -@Repository -public interface MesPcnTaskLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java deleted file mode 100644 index 68295ee..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnTask; -import org.springframework.stereotype.Repository; - -/** - * @Description :mes-pcn定时任务清单 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-26 - * @Modify: - **/ -@Repository -public interface MesPcnTaskRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java deleted file mode 100644 index c4ba8c9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPlanOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:08 - * @Modify: - **/ -@Repository -public interface MesPlanOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java deleted file mode 100644 index add5aac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPlc; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/26 7:47 PM - * @Description: - **/ -@Repository -public interface MesPlcRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java deleted file mode 100644 index d931c12..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcess; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProcessRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java deleted file mode 100644 index 2b9ba19..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdBindRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdBindRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java deleted file mode 100644 index c93700b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfgDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdCfgDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java deleted file mode 100644 index 1413862..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java deleted file mode 100644 index cf70703..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdPack; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdPackRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java deleted file mode 100644 index 7a55397..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdRouteCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java deleted file mode 100644 index 93e532b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteOptParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdRouteOptParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java deleted file mode 100644 index 6827df9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdScatterCfgBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/3/9 0009 - 18:03 - */ -@Repository -public interface MesProdScatterCfgBomRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java deleted file mode 100644 index 50602d5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCategory; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-26-10:28 - * @Modify: - **/ -@Repository -public interface MesProduceCategoryRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java deleted file mode 100644 index 2edb306..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCtgyPicture; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:35 - * @Modify: - **/ -public interface MesProduceCtgyPictureRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java deleted file mode 100644 index e049715..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:10 - * @Modify: - **/ -@Repository -public interface MesProduceSnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java deleted file mode 100644 index 607e64c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel; -import org.springframework.stereotype.Repository; - -/** - * @Description : 条码履历Dao层接口 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 16:36 - * @Modify: - **/ -@Repository -public interface MesProduceSnTravelRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java deleted file mode 100644 index eb8debf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProductDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java deleted file mode 100644 index de434ac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductEncodeCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-04-17-17:10 - * @Modify: - **/ -@Repository -public interface MesProductEncodeCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java deleted file mode 100644 index 8c909e7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckData; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 16:43 - * @Modify: - **/ -public interface MesQcCheckDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java deleted file mode 100644 index 1348b9c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 14:58 - * @Modify: - **/ -public interface MesQcCheckStandardRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java deleted file mode 100644 index bd19fef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJisDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesQueueJisDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java deleted file mode 100644 index 8a08948..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJis; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesQueueJisRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java deleted file mode 100644 index 82bbefb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrderDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:12 - * @Modify: - **/ -@Repository -public interface MesQueueOrderDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java deleted file mode 100644 index 989e14f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:11 - * @Modify: - **/ -@Repository -public interface MesQueueOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java deleted file mode 100644 index 1f048c1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/18 10:05 AM - * @Description: - **/ -@Repository -public interface MesRawPartSnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java deleted file mode 100644 index 1325e76..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepairRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:06 - * @Modify: - **/ -public interface MesRepairRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java deleted file mode 100644 index 2e22c77..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepair; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-08-17:13 - * @Modify: - **/ -@Repository -public interface MesRepairRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java deleted file mode 100644 index f217869..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRouteProcessCell; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteProcessCellRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java deleted file mode 100644 index 5749bbd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRouteProcess; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteProcessRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java deleted file mode 100644 index 92800fd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRoute; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java deleted file mode 100644 index 0f3e5eb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrapRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:07 - * @Modify: - **/ -public interface MesScrapRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java deleted file mode 100644 index 4dbf260..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrap; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-08-17:13 - * @Modify: - **/ -@Repository -public interface MesScrapRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java deleted file mode 100644 index 544c627..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShiftGroup; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-18-17:13 - * @Modify: - **/ -@Repository -public interface MesShiftGroupRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java deleted file mode 100644 index 7f5b1a7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShift; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-19-13:53 - * @Modify: - **/ -@Repository -public interface MesShiftRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java deleted file mode 100644 index b3cc087..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShiftRest; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-20 - * @Modify: - **/ -@Repository -public interface MesShiftRestRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java deleted file mode 100644 index f5fd71f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStationBomRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java deleted file mode 100644 index f7b386f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStepParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStepParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java deleted file mode 100644 index 5f3f562..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStepRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java deleted file mode 100644 index 6489cec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTime; -import org.springframework.stereotype.Repository; - -@Repository -public interface MesTimeRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java deleted file mode 100644 index d2be5f1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTorqueDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesTorqueDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java deleted file mode 100644 index 02911ac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTypeCfg; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\12\4 10:34 - * @Modify: - **/ -public interface MesTypeCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java deleted file mode 100644 index 71d7efa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 7:30 PM - * @Description: - **/ -public interface MesWcCheckRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java deleted file mode 100644 index cbf9cae..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheck; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 7:30 PM - * @Description: - **/ -public interface MesWcCheckRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java deleted file mode 100644 index 0e70427..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/28 12:04 PM - * @Description: - **/ -public interface MesWcEquipmentRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java deleted file mode 100644 index 672947b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellMonitorLog; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:58 PM - * @Description: - **/ -public interface MesWorkCellMonitorLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java deleted file mode 100644 index 98f4a1c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParamCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellParamCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java deleted file mode 100644 index 3a714cf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-30 - * @Modify: - **/ -@Repository -public interface MesWorkCellParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java deleted file mode 100644 index 52319d0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint; -import org.springframework.stereotype.Repository; - -/** - * @Description :工站队列Dao层接口 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 14:40 - * @Modify: - **/ -@Repository -public interface MesWorkCellPointRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java deleted file mode 100644 index ce59423..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java deleted file mode 100644 index 1295a8d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellStatus; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 11:21 - * @Modify: - **/ -@Repository -public interface MesWorkCellStatusRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java deleted file mode 100644 index e24b5db..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCenter; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCenterRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java deleted file mode 100644 index fea2dfb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrderLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-19-17:13 - * @Modify: - **/ -@Repository -public interface MesWorkOrderLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java deleted file mode 100644 index 40676c4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:13 - * @Modify: - **/ -@Repository -public interface MesWorkOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java deleted file mode 100644 index 3db9a90..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ /dev/null @@ -1,413 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.sqlpack; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.pcn.bean.*; -import org.springframework.util.StringUtils; - -/** - * @Description: - * @Reference: Mes 条件封装 - * @Author: Crish - * @CreateDate:2019-04-22-14:58 - * @Modify: - **/ -public class MesHqlPack { - - - /** - * 通用查询条件 - * - * @param organizeCode - * @return - */ - public static DdlPackBean getAllBaseData(String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - return packBean; - } - - /** - * 通用查询条件 - * - * @param organizeCode - * @return - */ - public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - return packBean; - } - - /** - * MES PCN系统配置信息条件查询 - * - * @param mesConfig - * @return - */ - public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); - } - if (!StringUtils.isEmpty(mesConfig.getCfgName())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); - } - if (!StringUtils.isEmpty(mesConfig.getIsValid())) { - DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); - } - return packBean; - } - - /** - * 根据打印模板的模板代码查询模板信息 - * - * @param mesLabelTemplate - * @return - */ - public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); - return packBean; - } - - /** - * 获取工作中心下所有的投料数据 - * - * @param mesCellFeed - * @param org - * @return - */ - public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { - DdlPackBean packBean = getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); - return packBean; - } - - - /** - * 获取原材料扫描信息的对应工序BOM - * - * @param stationBom - * @param rawPartSn - * @return - */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { - DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); - DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); - return packBean; - } - - /** - * 生产工单查询条件封装 - * - * @param mesWorkOrder - * @return - */ - public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); - } else { - if (!StringUtils.isEmpty(mesWorkOrder.getPageType()) && "1".equals(mesWorkOrder.getPageType())) { - DdlPreparedPack.getInPackArray(new Object[]{MesPcnEnumUtil.WORK_ORDER_STATUS.OPEN.getValue(), MesPcnEnumUtil.WORK_ORDER_STATUS.PAUSE.getValue(), - MesPcnEnumUtil.WORK_ORDER_STATUS.COMPLETE.getValue()}, "workOrderStatus", packBean); - } - } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getApprovalStatus())) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); - } - if (!StringUtils.isEmpty(mesWorkOrder.getIsValid())) { - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); - } - - // 时间段查询 - if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesWorkOrder.getStartTimeStart(), - mesWorkOrder.getStartTimeEnd(), - "startTime", packBean, true); - } - if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesWorkOrder.getEndTimeStart(), - mesWorkOrder.getEndTimeEnd(), - "endTime", packBean, true); - } - if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesWorkOrder.getCreateDateTimeStart(), - mesWorkOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - } - return packBean; - } - - /** - * 物料信息查询条件封装 - * - * @param mesPart - * @return - */ - public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - - if (!StringUtils.isEmpty(mesPart.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); - } - if (!StringUtils.isEmpty(mesPart.getPartName())) { - DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); - } - if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) { - DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); - } - if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) { - DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); - } - if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { - DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); - } - return packBean; - } - - /** - * MES 客户信息查询条件封装 - * - * @param customer - * @return - */ - public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); - if (!StringUtils.isEmpty(customer.getCustomerCode())) { - DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); - } - if (!StringUtils.isEmpty(customer.getCustomerName())) { - DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); - } - - return packBean; - } - - /** - * MES PCN系维修信息条件查询 - * - * @param mesRepair - * @return - */ - public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesRepair.getRepairCode())) { - DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); - } - if (!StringUtils.isEmpty(mesRepair.getRepairName())) { - DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); - } - if (!StringUtils.isEmpty(mesRepair.getRepairType())) { - DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); - } - return packBean; - } - - /** - * MES PCN系维修信息条件查询 - * - * @param mesScrap - * @return - */ - public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesScrap.getScrapCode())) { - DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); - } - if (!StringUtils.isEmpty(mesScrap.getScrapName())) { - DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); - } - if (!StringUtils.isEmpty(mesScrap.getScrapType())) { - DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean); - } - return packBean; - } - - /** - * MES PCN缺陷原因信息条件查询 - * - * @param mesDefectCause - * @return - */ - public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) { - DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean); - } - if (!StringUtils.isEmpty(mesDefectCause.getDcName())) { - DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean); - } - if (!StringUtils.isEmpty(mesDefectCause.getDcType())) { - DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean); - } - return packBean; - } - - /** - * 按条件分页查询产品条码补打印数据 - * - * @param mesProduceSn - * @return - */ - public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { - DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); - if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { - DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); - } - - // 时间段查询 - if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesProduceSn.getCreateDateTimeStart(), - mesProduceSn.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - } - if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { - DdlPreparedPack.timeBuilder( - mesProduceSn.getOutWorkCenterTimeStart(), - mesProduceSn.getOutWorkCenterTimeEnd(), - "outWorkCenterTime", packBean, true); - } - return packBean; - } - - /** - * 按条件分页查询包装条码补打印数据 - * - * @param mesPackage - * @return - */ - public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) { - - DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode()); - if (!StringUtils.isEmpty(mesPackage.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { - DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); - } - - // 时间段查询 - DdlPreparedPack.timeBuilder( - mesPackage.getCreateDateTimeStart(), - mesPackage.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - - return packBean; - } - - - /** - * MES班组信息查询条件封装 - * - * @param shiftGroup - * @param organizeCode - * @return - */ - public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { - - DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); - if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) { - DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); - } - if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { - DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); - } - if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean); - } - return packBean; - } - - public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { - DdlPackBean packBean = getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); - return packBean; - } - - - /** - * 按条件分页查询类型信息数据 - * - * @param typeCfg - * @return - */ - public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) { - - DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode()); - if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) { - DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); - } - if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) { - DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean); - } - if (!StringUtils.isEmpty(typeCfg.getTypeCode())) { - DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean); - } - - return packBean; - } -} From 3b3f0c98db30a7b4362ecf98abd08fdd9302f812 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 8 Dec 2020 18:10:39 +0800 Subject: [PATCH 221/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index df42ed8..79bab3b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -138,4 +138,14 @@ public class WmsTaskInfo extends BaseBean { this.custNo = custNo; this.vendorNo = vendorNo; } + + public WmsTaskInfo(String orderNo, Integer taskStatus, String transTypeCode, String createUser, String createDatetime, String organizeCode, String userNo) { + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.transTypeCode = transTypeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.organizeCode = organizeCode; + this.userNo = userNo; + } } From 0c50abaea8e31b734ffb4e78927cc3251720edec Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 8 Dec 2020 18:11:53 +0800 Subject: [PATCH 222/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 8daabbc..1f4955c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -86,7 +86,7 @@ public class DdlPreparedPack { * @param isShowTime 是否包含时分秒 */ public static void timeBuilder(String date, String columnName, DdlPackBean packBean, Boolean showTaday, boolean isShowTime) { - if (date != null && date.trim().length() > 0) { + if (date != null && date.trim().length() > 2) { String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); if (date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) { //只有一个逗号 From 2fa08438410cc26872f25f2a81b07db07b902423 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Wed, 9 Dec 2020 09:44:04 +0800 Subject: [PATCH 223/329] =?UTF-8?q?=E5=88=A0=E9=99=A4mes-pcn=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc6131f..f611147 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,6 @@ modules/i3plus-pojo-report modules/i3plus-pojo-softswitch modules/i3plus-pojo-workflow - modules/i3plus-pojo-mes-pcn modules/i3plus-pojo-sweb modules/i3plus-pojo-andon modules/i3plus-pojo-aps From d4696b54a3f29b96fd82ee4596afe17811341470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 9 Dec 2020 10:27:32 +0800 Subject: [PATCH 224/329] =?UTF-8?q?=E5=A2=A8=E8=A5=BF=E5=93=A5WMS=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E4=B8=9A=E5=8A=A1=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E9=80=9A=E7=94=A8=E8=84=9A=E6=9C=AC=E5=AE=9A=E5=88=B6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1+=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=92=8C=E4=BA=A7=E7=BA=BF=E5=90=8D=E7=A7=B0+?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 53 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/MesPpDetails.java | 4 ++ .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 12 +++++ 3 files changed, 69 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 5ad1a0b..ca44117 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 @@ -5142,6 +5142,59 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 生产工单类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PLAN_TYPE { + REPORT(10, "REPORT", "生产报工"), + PACKING(20, "PACKING", "打箱包装"); + + private int value; + private String code; + private String description; + + WORK_ORDER_PLAN_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * 是否贵重物料 * 默认为2 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java index 48df648..1b0f248 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -68,4 +68,8 @@ public class MesPpDetails extends BaseBean{ public Double getQty() { return qty == null ? 0D : this.qty.doubleValue(); } + + public Double getTransQty() { + return transQty == null ? 0D : this.transQty.doubleValue(); + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 4ca4350..0195b14 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -45,6 +45,13 @@ public class MesPpMaster extends BaseBean{ searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode") private String pdlineNo; + @Column(name="PDLINE_NAME_RDD") + @ApiParam("产线名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter", + searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterName") + private String pdlineNameRdd; + @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) @@ -72,6 +79,11 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_MASTER_STATUS") private Integer orderStatus = 0; + @Column(name="ORDER_TYPE") + @ApiParam(value = "单据类型", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_TYPE") + private Integer orderType = 0; + @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) From 981438c2a25fc8099e0a5b88f4761e52d5507ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 9 Dec 2020 17:55:46 +0800 Subject: [PATCH 225/329] =?UTF-8?q?=E3=80=9012997=2019048-=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A5=E6=89=93=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E4=BA=8C=E6=A3=80=E7=AE=B1=E6=A0=87=E7=AD=BE-20201204=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 6 ++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 40 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index f35d6ef..e1ab379 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @Author: Wynne.Lu @@ -190,6 +192,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("汇总数量") private Integer gatherQty = 0; + @Transient + @ApiParam("包装编号集合") + private List packageNoList = new ArrayList<>(); + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 37bdaec..15049c3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -719,4 +719,44 @@ public class MesPcnHqlPack { } return packBean; } + + /** + * 按条件分页查询包装条码查询数据 + * + * @param mesPackage + * @return + */ + public static DdlPackBean getPackageSn(MesPackage mesPackage) { + + DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPackage.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { + DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + } + + if(!CollectionUtils.isEmpty(mesPackage.getPackageNoList())){ + DdlPreparedPack.getInPackList(mesPackage.getPackageNoList(), "packageNo", packBean); + } + + DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean); + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesPackage.getCreateDateTimeStart(), + mesPackage.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + + return packBean; + } } From 88aea83c1afc61215626daed594ecc8e0304737b Mon Sep 17 00:00:00 2001 From: liangyao Date: Wed, 9 Dec 2020 18:43:42 +0800 Subject: [PATCH 226/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 6a02dc3..bf6b522 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -423,6 +423,7 @@ public class WmsDocMovementMaster extends BaseBean { this.custTel = custTel; } + public WmsDocMovementMaster(String orderNo,String createDatetime,Integer inQty,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { this.orderNo = orderNo; this.createDatetime = createDatetime; From c286c3d319e36be90d50559415daed34324b75ec Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 9 Dec 2020 19:27:39 +0800 Subject: [PATCH 227/329] =?UTF-8?q?=E5=AE=B9=E5=99=A8=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ac04bbd..b9836f9 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 @@ -456,7 +456,8 @@ public class MesPcnEnumUtil { EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"), - BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"); + BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"), + SCAN_CT_NO_TYPE("SCAN_CT_NO_TYPE", "料架号扫描校验类型值"); private String value; private String description; From b09a09f70b75b6ab65f5d05e27d5c008ca9b2e04 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 9 Dec 2020 19:28:56 +0800 Subject: [PATCH 228/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9mes=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=20=E5=BC=82=E5=B8=B8=E5=81=9C=E6=AD=A2?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=A4=8D=E4=BD=8D=E9=97=AE=E9=A2=98=20bi?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/WorkOrderBiModel.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java new file mode 100644 index 0000000..b268328 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/12/9 19:09 + * @desc + */ +@Data +@NoArgsConstructor +@Api("bi的工单model") +public class WorkOrderBiModel { + + @ApiParam("零件号") + private String partNo; + + @ApiParam("零件名") + private String partName; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工单号") + private String workOrderNo; + + public WorkOrderBiModel(String partNo, String partName, String workCenterCode, String workOrderNo) { + this.partNo = partNo; + this.partName = partName; + this.workCenterCode = workCenterCode; + this.workOrderNo = workOrderNo; + } +} From 9cd011c6ca228579cedcd2cb97fe7ddf381899a2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 10 Dec 2020 04:04:36 +0800 Subject: [PATCH 229/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 8902313..70d8791 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -93,6 +93,11 @@ public class WmsCSRange extends BaseBean { @AnnoOutputColumn(hidden = true) public String basZoneNo; + @Transient + @ApiParam("状态") + @AnnoOutputColumn(hidden = true) + public Integer orderStatus; + public WmsCSRange(){} public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ @@ -108,4 +113,17 @@ public class WmsCSRange extends BaseBean { this.partNo = partNo; this.partNameRdd = partNameRdd; } + + public WmsCSRange(String zoneNo, String locateNo) { + this.zoneNo = zoneNo; + this.locateNo = locateNo; + + } + + public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) { + this.orderNo = orderNo; + this.partNo = partNo; + this.zoneNo = zoneNo; + this.orderStatus = orderStatus; + } } From 6472ebddba44b33feffa7573639adf63122e45e2 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 10 Dec 2020 10:54:56 +0800 Subject: [PATCH 230/329] =?UTF-8?q?mes=E6=9E=9A=E4=B8=BE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 fbe4029..8204017 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 @@ -3737,8 +3737,7 @@ public class MesEnumUtil { INSTOCKED(40, "入库"), SHIPING(50, "发运"), REDO(60, "重做"), - CLOSE(90, "关闭"), - ; + CLOSE(90, "关闭"); private int value; private String description; From 23f24d297dc56fe507b2dcfec33900b7ae265079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 10 Dec 2020 10:55:01 +0800 Subject: [PATCH 231/329] =?UTF-8?q?fix(core):=E5=8D=95=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=9C=AA=E6=AD=A3=E5=B8=B8=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 1634410..a579c71 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -59,8 +59,7 @@ public class SysOrderNoRule extends BaseBean { @Column(name = "SERIAL_NO_LENGTH") @ApiParam(value = "流水号长度",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long serialNoLength; + private Integer serialNoLength; @Column(name = "IS_CYCLE") @ApiParam(value = "是否按日期循环", example = "1") From 4a120ca375cf02e57367a2b1bd9f83eb624eefff Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Thu, 10 Dec 2020 16:07:48 +0800 Subject: [PATCH 232/329] =?UTF-8?q?12736=2020027-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF-=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92--=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=88=90=E5=8A=9F=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=9C=8B=E5=88=B0=E5=AF=BC=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-20201124?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../mes/model/MesControlPlanTemplateModel.java | 35 ++++++++++------------ 2 files changed, 18 insertions(+), 20 deletions(-) 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 fbe4029..04223e8 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 @@ -2099,7 +2099,8 @@ public class MesEnumUtil { MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"), MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), - MES_JISA(640, "jisaExcelService", "JISA导入"); + MES_JISA(640, "jisaExcelService", "JISA导入"), + MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"); private int value; private String service; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java index df5b532..2b59554 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java @@ -6,16 +6,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.math.BigDecimal; -import java.util.List; - /** * @Description: 控制计划导入模板 * @CreateDate: 2020/9/29 * @Author: simon.song */ @Data -@Api(value="控制计划导入模板",description = "控制计划导入模板") +@Api(value = "控制计划导入模板", description = "控制计划导入模板") public class MesControlPlanTemplateModel extends BaseBean { private static final long serialVersionUID = 6846982556729401884L; @@ -40,25 +37,25 @@ public class MesControlPlanTemplateModel extends BaseBean { @AnnoOutputColumn private String custName; - @ApiParam("控制计划版本号") - @AnnoOutputColumn - private Integer controlPlanVersion; - - @ApiParam("是否启用") - @AnnoOutputColumn - private Integer isEnable; +// @ApiParam("控制计划版本号") +// @AnnoOutputColumn +// private Integer controlPlanVersion; -// @Column(name = "IS_ENABLE") // @ApiParam("是否启用") +// @AnnoOutputColumn // private Integer isEnable; + + /** + * 中航质量标准明细表 + */ @ApiParam("工作单元代码") @AnnoOutputColumn private String workCellCode; - @ApiParam("质量标准版本") - @AnnoOutputColumn - private Integer qualityStandardVersion; +// @ApiParam("质量标准版本") +// @AnnoOutputColumn +// private Integer qualityStandardVersion; //检测类型：10=首检，20=巡检，30=终检，40=发运检 @ApiParam("检测类型") @@ -87,11 +84,11 @@ public class MesControlPlanTemplateModel extends BaseBean { @ApiParam("是否允许让步") @AnnoOutputColumn - private String isConcession; + private Integer isConcession; @ApiParam("间隔时间") @AnnoOutputColumn - private String checkInterval; + private Integer checkInterval = 0; //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 @ApiParam("个数标识") @@ -119,11 +116,11 @@ public class MesControlPlanTemplateModel extends BaseBean { @ApiParam("公差上限") @AnnoOutputColumn - private BigDecimal differenceMaxLimit; + private Double maximum = 0d; @ApiParam("公差下限") @AnnoOutputColumn - private BigDecimal differenceMinLimit; + private Double minimum = 0d; @ApiParam("是否关键检测项") @AnnoOutputColumn From a014d8ceaa092eb8a14f776e78f0b93eea850eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 10 Dec 2020 17:15:07 +0800 Subject: [PATCH 233/329] =?UTF-8?q?=E3=80=9013137=2019048=20=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E7=B1=BB=E5=9E=8B=E6=B2=A1=E6=9C=89=E5=9C=A8=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E4=B8=AD=E5=B1=95=E7=A4=BA=2020201209=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java index 711d0ff..a6c48c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java @@ -12,4 +12,7 @@ public class MgnBoardListColorModel { @ApiParam("颜色") private String color; + @ApiParam("安灯类型") + private String alarmCode; + } From 85c22ea8bde6ccc529ec3ccb293be59e28b057ea Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 10 Dec 2020 17:29:43 +0800 Subject: [PATCH 234/329] =?UTF-8?q?=E7=94=B5=E6=B3=B3=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesPackageQueue.java | 76 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPackageTravel.java | 6 +- .../mes/repository/MesPackageQueueRepository.java | 13 ++++ 3 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java new file mode 100644 index 0000000..aeb5545 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java @@ -0,0 +1,76 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/10 11:10 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_QUEUE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "CT_NO") +}) +@Api("MES_包装队列") +public class MesPackageQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7427832962272134299L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameAdd; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ApiParam("数量") + private Double qty; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 42cc4d5..06df80c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -24,6 +21,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate +@Inheritance(strategy = InheritanceType.JOINED) @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java new file mode 100644 index 0000000..b13de12 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPackageQueue; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/10 11:24 AM + * @Modify: + */ +public interface MesPackageQueueRepository extends BaseRepository { +} From b37456b227e9c1222031bea52311d82e2210f126 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 10 Dec 2020 17:38:47 +0800 Subject: [PATCH 235/329] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesPackageQueue.java | 76 ---------------------- .../mes/repository/MesPackageQueueRepository.java | 13 ---- 2 files changed, 89 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java deleted file mode 100644 index aeb5545..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java +++ /dev/null @@ -1,76 +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.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Author: jokelin - * @Date: 2020/12/10 11:10 AM - * @Modify: - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_QUEUE", indexes = { - @Index(columnList = "PACKAGE_NO"), - @Index(columnList = "CT_NO") -}) -@Api("MES_包装队列") -public class MesPackageQueue extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7427832962272134299L; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装编码") - private String packageNo; - - @Column(name = "CT_NO") - @ApiParam("容器编号") - private String ctNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameAdd; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ApiParam("数量") - private Double qty; - - @Column(name = "LOT_NO") - @ApiParam("批号") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批号") - private String fixLotNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "SEQ", columnDefinition = "decimal(18,8)") - @ApiParam("排序") - private Double seq; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java deleted file mode 100644 index b13de12..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesPackageQueue; - -/** - * @Description: - * @Author: jokelin - * @Date: 2020/12/10 11:24 AM - * @Modify: - */ -public interface MesPackageQueueRepository extends BaseRepository { -} From 8741facd02ff7edf5f28975d71abfd2b76e32f9d Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 10 Dec 2020 20:21:46 +0800 Subject: [PATCH 236/329] =?UTF-8?q?=E4=B8=AD=E8=88=AABI=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index 611b035..5595821 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -5,11 +5,7 @@ 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.Column; -import javax.persistence.Entity; import javax.persistence.Transient; /** @@ -64,6 +60,9 @@ public class ProdOrgModel extends BaseBean { @ApiParam("工位类型") private Integer workCellType; + @ApiParam("工位等级:正常工位，监控工位") + private Integer grade; + @Transient @ApiParam("序号") private Integer seq; From 231c4b015aa8a4e1a54a2dc0529f52a8589c86f5 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 10 Dec 2020 21:15:31 +0800 Subject: [PATCH 237/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E5=8D=A1=E6=8E=A7=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E7=89=A9=E6=96=99=EF=BC=8C=E4=BA=8C=E6=AC=A1=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E5=AD=98=E5=82=A8=E5=8C=BA=EF=BC=8C=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9C=AA=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 8eb49bb..05dd1ce 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 @@ -58,7 +58,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("行号") private Integer item; - @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") private Double qty; @@ -75,14 +75,14 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("订单号") private String orderNo; - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") private Double printQty; //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; } - @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") private Double rcQty = 0d; From fe23cab34b08c77a207c9818c47e8736b67a946b Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Fri, 11 Dec 2020 10:46:13 +0800 Subject: [PATCH 238/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 10 ++++------ .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 9 ++++----- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 9 ++++----- 3 files changed, 12 insertions(+), 16 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 88f58f3..cd5c1ac 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 @@ -14,12 +14,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.Version; +import javax.persistence.*; /** * @Description :移库单明细实体(用于转储类业务) @@ -39,6 +34,9 @@ import javax.persistence.Version; @Index(columnList = "SRC_NO"), @Index(columnList = "ORGANIZE_CODE") }) +@Inheritance( + strategy = InheritanceType.JOINED +) @Api("移库单明细表") public class WmsDocMovementDetails extends BaseBean { private static final long serialVersionUID = -4800308354250386102L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 787c2a1..6d86f74 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -13,11 +13,7 @@ import lombok.ToString; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -39,6 +35,9 @@ import java.util.List; @Index(columnList = "BUSI_TYPE"), @Index(columnList = "ORGANIZE_CODE") }) +@Inheritance( + strategy = InheritanceType.JOINED +) @Api("移库单表") @ToString public class WmsDocMovementMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 8095d5e..b9a406b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -11,11 +11,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 移库单条码表 @@ -36,6 +32,9 @@ import javax.persistence.Transient; @Index(columnList = "SN"), @Index(columnList = "ORGANIZE_CODE") }) +@Inheritance( + strategy = InheritanceType.JOINED +) @Api("移库条码信息") public class WmsDocMovementSn extends BaseBean { From 0bb69b6505941bbff8fe2f2833d2a3924264f94d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 11 Dec 2020 14:53:34 +0800 Subject: [PATCH 239/329] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 7 +++++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index b92fbbe..e175815 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import lombok.Data; import java.io.Serializable; @@ -19,6 +20,7 @@ public class WmsMoveDetailsModel implements Serializable { private static final long serialVersionUID = -6968143574442339454L; private WmsMoveDetails details; private List moveSnList; + private List wmsStockSnList; public WmsMoveDetailsModel(WmsMoveDetails details, List moveSnList) { this.details = details; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 69772a7..e25e48e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -70,9 +70,12 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("单位") public String unit; + /** + * 实盘数量 + **/ @Column(name="FACT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") - @ApiParam(value = "实盘数量", example = "0") + @ApiParam(value = "数量", example = "0") public Double factQty; /** @@ -80,7 +83,7 @@ public class WmsCSFactTrans extends BaseBean { */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ITEM_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; @Column(name="REMARK") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 85b257d..a8aa00c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -53,7 +53,7 @@ public class WmsCSOrderDetails extends BaseBean { @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") + @ApiParam(value = "数量", example = "0") public Double qty; @Column(name = "UNIT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 70d8791..55ca80d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -100,6 +100,7 @@ public class WmsCSRange extends BaseBean { public WmsCSRange(){} + public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ this.zoneNo = zoneNo; this.partNo = partNo; @@ -117,7 +118,6 @@ public class WmsCSRange extends BaseBean { public WmsCSRange(String zoneNo, String locateNo) { this.zoneNo = zoneNo; this.locateNo = locateNo; - } public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) { From ef971201e39630c9178e18b738f180a652dec6d3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 11 Dec 2020 18:02:32 +0800 Subject: [PATCH 240/329] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E6=96=B0=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index 9ff7458..6403216 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -56,4 +56,8 @@ public class MesNumberRule extends BaseBean implements Serializable { @Column(name = "IS_CYCLE") @ApiParam("最大值后循环") private Integer isCycle; + + @Column(name = "SPILT_RULE") + @ApiParam("拼接规则") + private String spiltRule; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index ef5c338..f976999 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -135,6 +135,14 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam(value = "包装数量") private Double qty2; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "VERSION_NO") + @ApiParam("版本号") + private String versionNo; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 94dacc2..03b6571 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -94,6 +94,12 @@ public class GenSerialNoModel { @ApiParam("工序代码") private String processCode; + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("版本号") + private String versionNo; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; From c4023d4bac0881d76f14db8a8d12a9d876ad62b2 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 11 Dec 2020 20:06:23 +0800 Subject: [PATCH 241/329] =?UTF-8?q?=E5=9D=A4=E6=B3=B0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 4084304..3e924c4 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 @@ -549,7 +549,8 @@ public class WmsStockSn extends BaseBean { @ApiParam("库位Z") private Integer z; - public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z) { + public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z, + String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) { this.sn = sn; this.vendorNo = vendorNo; this.snStatus = snStatus; @@ -561,6 +562,11 @@ public class WmsStockSn extends BaseBean { this.x = x; this.y = y; this.z = z; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.qualityDate = qualityDate; } public WmsStockSn() { From eb56d52e17768ddde910fca8ba806230a8252b95 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 12 Dec 2020 19:43:00 +0800 Subject: [PATCH 242/329] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index e25e48e..c7bae1b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -38,15 +38,15 @@ public class WmsCSFactTrans extends BaseBean { public String orderNo; @Column(name="WH_NO") - @ApiParam("仓库代码") + @ApiParam("仓库编码") public String whNo; @Column(name="ZONE_NO") - @ApiParam("存储区编号") + @ApiParam("存储区编码") public String zoneNo; @Column(name="LOCATE_NO") - @ApiParam("库位编号") + @ApiParam("库位编码") public String locateNo; @Column(name="PART_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 55ca80d..970d886 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -120,6 +120,10 @@ public class WmsCSRange extends BaseBean { this.locateNo = locateNo; } + public WmsCSRange(String zoneNo) { + this.zoneNo = zoneNo; + } + public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) { this.orderNo = orderNo; this.partNo = partNo; From b7c4e76163d318bcd76d66c1ce36470eebcf633f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 13 Dec 2020 15:12:14 +0800 Subject: [PATCH 243/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0joined=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java | 3 +++ .../cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java | 3 +++ .../cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java | 3 +++ .../cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java | 3 +++ .../cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java | 3 +++ .../cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java | 3 +++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java | 3 +++ .../estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 1 + .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java | 1 + .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java | 3 +++ .../cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java | 3 +++ .../i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java | 4 +++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java | 4 +++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java | 4 +++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java | 4 +++- .../cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java | 4 +++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java | 4 +++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java | 4 +++- .../cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java | 4 +++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java | 4 +++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java | 4 +++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java | 4 +++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java | 4 +++- .../cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java | 3 +++ .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java | 3 +++ .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java | 3 +++ .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java | 3 +++ .../cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java | 3 +++ .../i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java | 3 +++ .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 3 +++ .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 3 +++ .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java | 3 +++ .../cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java | 3 +++ .../estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 6 +++--- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 6 +++--- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java | 3 +++ .../i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java | 3 +++ .../i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java | 3 +++ .../estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java | 3 +++ .../i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java | 3 +++ .../estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java | 3 +++ .../estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 3 +++ .../estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 3 +++ .../estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java | 3 +++ .../estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java | 3 +++ .../i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java | 3 +++ .../i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java | 3 +++ .../i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java | 3 +++ .../i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java | 3 +++ 619 files changed, 1850 insertions(+), 65 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java index 979bd4b..7fe53f7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTION_MODULE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("作业组件") public class AndonActionModule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java index 6a3af09..a203e27 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTION_MODULE_GROUP") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("组件集") public class AndonActionModuleGroup extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java index 5364d0b..1f38770 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTION_MODULE_PARAM") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("组件参数") public class AndonActionModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java index c24541f..85e0253 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTION_ROUTE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("作业流程") public class AndonActionRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java index 9e23c15..242b401 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTOR") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR信息") public class AndonActor extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java index 81e2f4b..9001d81 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTOR_RULE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR消息类型配置") public class AndonActorRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java index 9cb491b..923a1e7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "ANDON_呼叫原因") public class AndonAlarmCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java index 0594355..1dd3267 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯子类型") public class AndonAlarmDetailType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java index 286fcbc..b190b25 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_呼叫通知配置") public class AndonAlarmResponseCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java index 17279ed..3b1b0c8 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ALARM_ROUTE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯作业流程配置") public class AndonAlarmRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java index 8a9523c..15163b4 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯作业流程组件参数") public class AndonAlarmRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java index 493a665..4d777cc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ALARM_TYPE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯类型") public class AndonAlarmType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java index 84b7e5d..ee0d921 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_AREA_ALARM_TYPE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域安灯类型") public class AndonAreaAlarmType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java index 82bfda2..4c78ea1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="ANDON_BROADCAST") @Api("安灯广播") public class AndonBroadCast extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java index 698bebb..9a78d8f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java @@ -6,6 +6,8 @@ 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; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="ANDON_BROADCAST_CFG") @Api("生产区域") public class AndonBroadCastCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index a6f9b22..f030511 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工作单元呼叫原因配置") public class AndonCellAlarmCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index 2c76fac..b355d85 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工作单元事件原因配置") public class AndonCellEventCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index b6856ba..df80c61 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工作单元处理方法配置") public class AndonCellEventMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java index ef790dc..76ed01a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工作单元事件现象") public class AndonCellEventPhenomenon extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java index d4fb382..5f5ae0c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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.Interceptor; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_工位分组配置") public class AndonCellGroupCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java index a6653c7..c2aa413 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="ANDON_CONFIG") @Api(value="系统配置") public class AndonConfig extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 1db40c9..f0fca4c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_自处理配置") public class AndonDisposalCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java index d2bd2cd..8e5bc58 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("Andon自处理维护配置") public class AndonDisposalMaintenCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java index e0c6640..a2ecc40 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "ANDON_事件原因") public class AndonEventCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java index 2b9dc86..dce3e28 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "ANDON_事件处理方法") public class AndonEventMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java index 52cf481..c6d79c7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_事件现象") public class AndonEventPhenoMenon extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java index a7dcae8..d75116b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -34,6 +36,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯队列") public class AndonHaltCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java index 4def408..2f01aee 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_停机类型") public class AndonHaltType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java index 6213675..85b99c5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON知识库") public class AndonKnowledgeBase extends BaseManageQueue implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index d6fe7d9..5b3fb7d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.apache.commons.beanutils.BeanUtils; import org.hibernate.annotations.DynamicInsert; @@ -41,6 +43,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯队列") public class AndonManageQueue extends BaseManageQueue implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index 66377b6..acf952a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -36,6 +38,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("去去去去去去去去去安灯记录") public class AndonManageRecord extends BaseManageQueue implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java index e34f15d..f4816a5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("通知记录") public class AndonMessageRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java index 519d5bf..cac7d25 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_MESSAGE_TYPE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("消息类型") public class AndonMessageType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index cc45276..06de9c6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -30,6 +32,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯PLC控制") public class AndonPLC extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java index ee4c926..57e6ba9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java @@ -4,6 +4,8 @@ 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; @@ -34,6 +36,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯PLC监控记录") public class AndonPLCRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java index 5893a1d..676902f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="ANDON_PLC_COLOR_CFG") @Api(value="PLC三色灯控制") public class AndonPlcColorCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index df23bab..c120c58 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="ANDON_MANAGE_ATTACH") @Api(value="安灯附属表") public class AndonQueueAttach extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java index 2a428d1..41ffdec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("通知方式") public class AndonResponse extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java index 7236d3a..0885528 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java @@ -5,6 +5,8 @@ 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; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("安灯通知对象") public class AndonResponseObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java index 882ba39..f022035 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_上升流程配置") public class AndonRiteRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java index b15ee39..55d3f3c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; 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; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ANDON_上升配置明细") public class AndonRiteRouteDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java index fd7db4f..ae11cf7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ROUTE_MODULE_PARAM") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程组件参数") public class AndonRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java index bf2755c..6713197 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ROUTE_STATUS") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态") public class AndonRouteStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java index ceaea06..3842c8d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -4,6 +4,8 @@ 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; @@ -22,6 +24,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态异常记录") public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java index 3316350..675642a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -31,6 +33,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_AREA") @Api("生产区域") public class MesArea extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java index 2761fab..cd85bdd 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -31,6 +33,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_EQUIPMENT") @Api("生产设备") public class MesEquipment extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java index 9098f6b..3bb41bd 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java index 8bb58e7..913582d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL") @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java index 8cf20a2..b380349 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CENTER") @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java index eb1c3c2..d347ac7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_VENDOR") @Api("供应商信息") public class BasVendor extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java index 2d8aa20..3d4840c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfCustOrderData.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -32,6 +34,7 @@ import java.util.Map; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_CUST_ORDER_DATA") @Api("IF_客户月度订单数据") public class IfCustOrderData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java index 289babc..1fff7dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_DEFECT_DATA") @Api("不良信息接口数据") public class IfDefectData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 30cbe36..defd057 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_DISMENTLE_RECORD") @Api("物料拆解表") public class IfDismantleRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java index a41617f..4632486 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_EDI_INITIAL_DATA") @Api("EDI_初始数据表") public class IfEdiInitialData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java index 5583de7..d03759d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_PACKAGE") @Api("料箱表") public class IfPackage extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index bab82d3..1cc212f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_PACKAGE_DETAIL") @Api("包装明细表") public class IfPackageDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java index 005e0d3..d9e1baf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_PART_PULL") @Api("IF_物料拉动") public class IfPartPull extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index ff25483..4b09f12 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -5,6 +5,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.ColumnDefault; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_PRODUCT_OFF_LINE") @NoArgsConstructor @AllArgsConstructor diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 25c6e0e..daa66a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_QC_ORDER") @Api("IF_质检单") public class IfQcOrder extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java index 7972aa2..0526aee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_QC_RESULT") @Api("IF_质检结果") public class IfQcResult extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index 4693daa..266168a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_QUEUE_SHIPPING") @Api("JIT发运数据同步") public class IfQueueShipping extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java index 561bd95..e252fe6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_RAW_PART_DATA") @Api("原料上线数据") public class IfRawPartData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java index 221abea..a4c58f9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_WMS_PPM") @Api("WMS PPM 接口表") public class IfWmsPpm extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java index d58ab5f..e33b8df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ACTION") @Api("mes系统业务动作") public class MesAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java index 7f2a912..cd71f07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ACTION_IF") @Api("动作接口配置") public class MesActionIf extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java index 68d952f..fc699d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ACTION_METHOD") @Api("系统业务动作方法") public class MesActionMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java index fb1dcd3..0d4ae9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_AGV_STOP_RECORD") @Api("MES_停机记录表") public class MesAgvStopRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java index 856d009..465d4ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_AREA") @Api("生产区域") public class MesArea extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java index 97527e8..3374913 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java @@ -28,9 +28,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BLIND_HISTORY") @Api("MES_盲检记录") -@Inheritance(strategy = InheritanceType.JOINED) public class MesBlindHistory extends BaseBean implements Serializable { private static final long serialVersionUID = -7459452475180601499L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java index 147e91c..28fca0a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BLIND_RULE") @Api("MES_盲检规则") public class MesBlindRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java index b82bbae..0ee410e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BLIND_TOPIC_SETTING") @Api("MES_盲检问题设置") public class MesBlindTopicSetting extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java index 7893a30..62f911d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoard.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD") @Api("MES_看板") public class MesBoard extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java index fcf8e78..f1868e7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardArea.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_AREA") @Api("mes看板车间配置") public class MesBoardArea extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java index 98a0cd9..28ceb7b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_CUSTOM_PARAM_CFG") @Api("MES_看板自定义参数配置") public class MesBoardCustomParamCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java index 9509fc5..c3aa9a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_CUSTOMER_DATA") @Api("MES_看板客户相关信息") public class MesBoardCustomerData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java index aa78191..b8a1442 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_DISPLAY") @Api("MES_看板跑马灯") public class MesBoardDisplay extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 6902d49..45b2ecf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_EQU_DETAIL") @Api("MES_看板设备明细") public class MesBoardEquDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java index a4f9a61..78b99c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_EQU_STATUS") @Api("MES_看板设备状态") public class MesBoardEquStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java index 2d1b94f..e3c9b8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_IMAGE") @Api("MES_看板图片") public class MesBoardImage extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java index 0768d03..5281d85 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_LINE") @Api("看板产线配置") public class MesBoardLine extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java index aa0bce6..aa1a5fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_LINE_COORDS_MATRIX") @Api("MES_看板产线坐标") public class MesBoardLineCoordsMatrix extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java index d8e07a0..fc0c63c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_LINE_MATRIX") @Api("MES_看板产线矩阵") public class MesBoardLineMatrix extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java index ee461b9..9a7304d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_LINE_STAFF_MATRIX") @Api("MES_看板产线员工能力矩阵") public class MesBoardLineStaffMatrix extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java index 13f0eab..59057d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_BOARD_MAFACT_ASSESSMENT") @Api("MES_看板麦格纳评定项") public class MesBoardMafactAssessment extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java index cfca7b3..8ea7818 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMonitorObject.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_MONITOR_OBJECT") @Api("MES_看板监控对象") public class MesBoardMonitorObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java index bbbb380..00e2194 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_PICTURE") @Api("MES_看板图片") public class MesBoardPicture extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 80d3a4e..59e3159 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_PLAN_CAPACITY") @Api("MES_看板计划产能") public class MesBoardPlanCapacity extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java index 00b7a77..4d9f5be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_SHIFT") @Api("MES_看板班次") public class MesBoardShift extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java index e9138cf..9555a82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_SHIFT_SECTION") @Api("MES_看板班次时段") public class MesBoardShiftSection extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java index a07f070..582f004 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_SHIFT_SECTION_CAP") @Api("MES_看板时段计划产量") public class MesBoardShiftSectionCap extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java index 55288d0..eac7da9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_SUBMENU") @Api("MES_看板子菜单") public class MesBoardSubmenu extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java index b2638a3..4136113 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_SWITCH_CFG") @Api("MES_看板切换配置") public class MesBoardSwitchCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java index 7ca60bc..3e45c9d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardType.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_TYPE") @Api("MES_看板类型") public class MesBoardType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java index 786c128..c095ace 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardTypeBaseCfg.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOARD_TYPE_BASE_CFG") @Api("MES_看板类型基础配置") public class MesBoardTypeBaseCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java index 1140335..5f7ba11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_BOARD_WORK_CELL") @Api("MES_看板工位信息") public class MesBoardWorkCell extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 6cad2bb..6095463 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BOM", indexes = { @Index(columnList = "PART_NO") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 62e0e18..8cc2d91 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BUTTON_STATUS") @Api("按钮状态配置表") public class MesButtonStatus extends BaseBean implements Serializable { 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 3bef0b1..1059142 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 @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_BYPASS_MAPPING") @Api("MES_BYPASS项映射关系") public class MesBypassMapping extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java index e250191..bbbf3ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CACHA_QUEUE") @Api("MES缓存队列") public class MesCachaQueue extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index 96d5dce..826f54d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CELL_FEED") @Api("工位投料信息") public class MesCellFeed extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index 62e56c9..51a5a51 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CELL_FEED_RECORD", indexes = { @Index(columnList = "ORDER_NO") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java index 4fb2273..6aec6eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CHECK_DATA_CFG", indexes = { @Index(columnList = "CHECK_CFG_NO") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java index d385b72..edad745 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CONFIG") @Api("mes配置表") public class MesConfig extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java index 671b482..d7d7073 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CONTAINER") @Api("MES_容器类型") public class MesContainer extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java index 81a783f..b1ecc13 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CONTAINER_LOCATION") @Api("MES_容器位置") public class MesContainerLocation extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java index b317f3c..c0f1d12 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CONTAINER_TYPE") @Api("MES_容器类型") public class MesContainerType extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java index 77c1384..1b1819f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CONTROL_PLAN") @Api("中航控制计划主表") public class MesControlPlan extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 8382b3e..b0ce622 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index 7b4df40..c3b4d99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CUST_PROD_LINE") @Api("客户产线代码") public class MesCustProdLine extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index cfaf6f5..9ff2531 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CUSTOMER") @Api("客户信息") public class MesCustomer extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 71e21af..ad614a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CUSTOMER_PART") @Api("客户零件关系") public class MesCustomerPart extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java index 5d11d7c..d8bd8ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_CUSTOMER_SN_RULE") @Api("MES_客户条码规则") public class MesCustomerSnRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java index 35ec80a..8f45501 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DATA_AUTH") @Api("数据权限") public class MesDataAuth extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index af4d758..5f382f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DATA_OBJECT") @Api("数据对象") public class MesDataObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java index ffd58b8..a6b7d04 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DATA_WARNING") @Api("数据预警配置") public class MesDataWarning extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index b603553..fbea393 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DATASOURCE") @Api("地址清单") public class MesDatasource extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java index 5a8223f..3ad988c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DB_CHECK_RECORD") @Api("中航复核异常记录表") public class MesDbCheckRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java index d59c599..be378c2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DB_DATA_CHECK") @Api("中航DB数据检查配置表") public class MesDbDataCheck extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index fb61ecb..c724e84 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -4,6 +4,8 @@ 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; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DEFECT") @Api("缺陷表") public class MesDefect extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java index abc53be..360f5c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DEFECT_CAUSE") @Api("缺陷原因表") public class MesDefectCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java index 7bffe76..035734b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DEFECT_LOCATION") @Api("产品缺陷位置") public class MesDefectLocation extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index cb04f19..ef071db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DEFECT_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "CREATE_DATE_TIME") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index d57df5e..fa0eb9a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DISMANTLE_RECORD", indexes = { @Index(columnList = "SN"), @Index(columnList = "CREATE_DATE_TIME") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java index f21e756..25a7a94 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EDI_DATA") @Api("EDI数据") public class MesEdiData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java index 5e4db8a..8d7de06 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EDI_PARSER_CONFIG") @Api("EDI解析配置表") public class MesEdiParserConfig extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java index 67b5bdd..2444c2d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEncodeRuleMap.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ENCODE_RULE_MAP") @Api("MES_编码规则映射表") public class MesEncodeRuleMap extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java index 6c9aa12..c2c9575 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ENUM") @Api("MES_枚举表") public class MesEnum extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java index 67387e7..24e841e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_ALARM_LOG", indexes = { @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java index d631542..69dd9c4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_FAULT_CAUSE") @Api("MES_设备故障原因") public class MesEquFaultCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java index 2d65481..8218d0f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_FAULT_METHOD") @Api("MES_设备故障处理措施") public class MesEquFaultMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java index 44fcf64..12ba1c4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_FAULT_PHENOMENON") @Api("MES_设备故障现象") public class MesEquFaultPhenomenon extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index 2bcd8d3..b394f65 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -5,6 +5,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_EQU_NOTIFY_OBJECT_CFG") @Api("设备通知对象配置") public class MesEquNotifyObjectCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 8c1b09f..b08353f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK", indexes = { @Index(columnList = "TASK_NO") }, uniqueConstraints = { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index e164c36..69ee2b9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_DETAIL", indexes = { @Index(columnList = "EQUIPMENT_CODE") }, uniqueConstraints = { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java index 53438d6..66b686c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_EQU_TASK_NOTIFY_CFG") @Api("设备作业通知配置") public class MesEquTaskNotifyCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index d68cdec..3454a65 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_PLAN") @Api("设备周期作业计划") public class MesEquTaskPlan extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java index 057933b..9d0dd79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_PLAN_CFG") @Api("设备周期作业计划配置") public class MesEquTaskPlanCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java index 8d4a7b8..157e1e7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java @@ -5,6 +5,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_REPAIR_RECORD", indexes = { @Index(columnList = "EQUIPMENT_CODE") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java index 0fe1e32..7e228d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_STANDARD") @Api("设备作业要求") public class MesEquTaskStandard extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 212214d..bb98aa8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -5,6 +5,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQU_TASK_STANDARD_RECORD", indexes = { @Index(columnList = "EQUIPMENT_CODE") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index b33ac9b..b055268 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQUIPMENT") @Api("生产设备") public class MesEquipment extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java index 38d4717..7337cac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQUIPMENT_TOOLING") @Api("MES_设备工装关系") public class MesEquipmentTooling extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java index 0480688..92059ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EQUIPMENT_TRAVEL") @Api("设备运行履历表") public class MesEquipmentTravel extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java index c20de53..5d1a172 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") public class MesEsop extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java index ae69773..21636fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EVENT") @Api("系统业务事件") public class MesEvent extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java index 6e6c529..7fe4c36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java @@ -6,6 +6,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import java.io.Serializable; @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EVENT_ACTION") @Api("系统业务事件动作") public class MesEventAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java index 8c348e2..2204302 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EXCEPTION_ALERT_CFG") @Api("MES_异常提醒配置") public class MesExceptionAlertCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java index a904459..fae28e5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EXCEPTION_WINDOW_RECORD") @Api("MES_弹窗异常提醒记录") public class MesExceptionWindowRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java index 33b0024..0a15085 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_EXTEND_OBJECT_CFG") @Api("扩展对象结构") public class MesExtendObjectCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java index a78fc9f..e9cb5cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FAULT_CAUSE") @Api("mes故障原因表") public class MesFaultCause extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java index 4a0e758..3281e50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FAULT_METHOD") @Api("MES_故障处理措施") public class MesFaultMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index d66b12b..fee295d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FAULT_PHENOMENON") @Api("mes故障现象表") public class MesFaultPhenomenon extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index 06a48ba..9ef660c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FI_CFG") @Api("首检件配置") public class MesFiCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java index e5e7b26..586a8cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java @@ -5,6 +5,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FILE") @Api("文件表") public class MesFile extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java index c42ce77..dd6e895 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FURNACE_LOCATION") @Api("MES_炉内模式位置信息") public class MesFurnaceLocation extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java index 15e8fb0..c8f37b2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_FURNACE_LOCATION_DETAIL") @Api("MES_炉内占位信息") public class MesFurnaceLocationDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java index b353da2..342a0de 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_GENERATE_QC_ORDER") @Api("待生成检验单") public class MesGenerateQcOrder extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java index 83e625f..6e0b5ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGunCalibrationRecord.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_GUN_CALIBRATION_RECORD") @Api("校枪记录表") public class MesGunCalibrationRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java index ca6cde8..0f83b65 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_HNC_AGV_RUNNING") @Api("延锋海纳川agv运行状态表") public class MesHncAgvRunning extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java index 7ef9e84..d3c4a6f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_IF") @Api("接口清单") public class MesIf extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java index 653bb98..2cee1b9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_JIT_ISSUE_CFG") @Api("MES_客户JIT队列下达配置") public class MesJitIssueCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java index 36dd48a..5974160 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_JIT_LOCK_CACHE") @Api("MES_JIT队列锁定池") public class MesJitLockCache extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java index 29f74c0..e2766d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_JIT_ORDER_CACHE") @Api("MES_JIT队列订单池") public class MesJitOrderCache extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java index e036e8a..b76e424 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_KEY_ACTION") @Api("关键动作") public class MesKeyAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index 00839db..bca4d77 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_KEY_DATA") @Api("设备关键数据") public class MesKeyData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index c7a6e6d..c48d8cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_KP_DATA") @Api("物料关键数据关系") public class MesKpData extends BaseBean implements Serializable { 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 e0c9fca..4236f7c 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 @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_KPSN_RULE") @Api("关键件条码校验规则") public class MesKpsnRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index aebd2e2..bc9f9f9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java index 36fb0a3..94828e2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java index f755466..b914dd8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_LINE_FAULT_RECORD") @Api("产线故障记录表") public class MesLineFaultRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java index 7610ada..274931c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_LINE_OPERATION") @Api(value = "产线 开线或停线") public class MesLineOperation extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java index 2ab848c..109e4d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_LOCATION") @Api("MES_库位信息") public class MesLocation extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java index f81f827..58216c2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLog.java @@ -4,6 +4,8 @@ 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 org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java index f7b71d3..842c66e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_LOOP_QC_GENERATE_DETAIL") @Api("MES_巡检项生成明细") public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index 4b08276..f931891 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_METHOD") @Api("系统业务方法") public class MesMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java index 224a78c..a2e0a22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_MODEL_GRADE") @Api("MES_车型等级") public class MesModelGrade extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java index 13b98ce..9b1b305 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_MONITOR_TASK") @Api("监听任务") public class MesMonitorTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index 36ff11f..fb88903 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_MONITOR_TASK_DETAIL") @Api("监听任务明细") public class MesMonitorTaskDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java index 0e42446..5de215b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_MOULD_PART") @Api("MES_模具_零件对照表") public class MesMouldPart extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index 9ff7458..c1348d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -5,6 +5,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_NUMBER_RULE") @Api("条码生成规则") public class MesNumberRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java index d717036..c40c38a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_NUMBER_SERIALNO") @Api("编码序号") public class MesNumberSerialno extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index a63724c..92cfc51 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OBJECT_CFG") @Api("对象结构") public class MesObjectCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java index 10e85f2..dbdd627 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OBJECT_DAO") @Api("MES_对象与dao对应关系") public class MesObjectDao extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 9d9e191..9c1869e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OEE") @Api("MES_OEE数据") public class MesOee extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java index 5637728..ceaa2fc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OFF_LINE_RECORD") @Api("MES_产品下线记录") public class MesOffLineRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java index 99cc4bb..9b52ea8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OPERATE_OBJECT") @Api("MES_运算对象") public class MesOperateObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java index 9a340e4..ee21d82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE") @Api("MES_运算对象属性") public class MesOperateObjectAttribute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java index a70cac7..4766422 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_OPERATE_OBJECT_CFG") @Api("MES_运算对象属性配置") public class MesOperateObjectCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java index d752e8c..e2ceb0b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") @Deprecated diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index 37a9793..c59072c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PACK_SPEC") @Api("包装规格") public class MesPackSpec extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index e1ab379..629f60b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PACKAGE", indexes = { @Index(columnList = "PACKAGE_NO"), @Index(columnList = "PART_NO"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 0f28b91..fafc076 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -5,6 +5,8 @@ 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; @@ -22,6 +24,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PACKAGE_DETAIL", indexes = { @Index(columnList = "PACKAGE_NO"), @Index(columnList = "SERIAL_NUMBER"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java index 77c9ed0..56b8b00 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PACKAGE_TRANS") @Api("MES_出入库事务") public class MesPackageTrans extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 06df80c..27b88aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -5,6 +5,8 @@ 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; @@ -21,8 +23,8 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Inheritance(strategy = InheritanceType.JOINED) @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index ef5c338..bd2895c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART") @Api("物料信息") public class MesPart extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java index 9553053..3073723 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_CATEGORY") @Api("零件种类") public class MesPartCategory extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 90ec210..7358782 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_CHECK") @Api("物料校验项") public class MesPartCheck extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java index 578b4c6..fbf7029 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_COLOR") @Api("MES_产品颜色") public class MesPartColor extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java index f900c6c..efc1077 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_CONTAINER_CAPACITY") @Api("MES_产品容器容量配置") public class MesPartContainerCapacity extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java index 87bcffe..3c782f6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_FORMULA") @Api("MES_物料配方") public class MesPartFormula extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java index 8ba6f09..8053275 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_FURNACE") @Api("MES_物料上炉模式") public class MesPartFurnace extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index a399ef3..efb8dc6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_OBJECT") @Api("物料对象配置表") public class MesPartObject extends BaseBean implements Serializable { 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 c5c1b75..4ebc140 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,6 +4,8 @@ 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; @@ -19,6 +21,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "MES_PART_PROD_CFG_TYPE") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("MES_物料项目关系") public class MesPartProdCfgType extends BaseBean implements Serializable { private static final long serialVersionUID = -640972198237355570L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java index e680c19..7ebc256 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_PRODUCE_TYPE") @Api("产品生产类型") public class MesPartProduceType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java index 9ad4d4b..54d95cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_SAMPLE") @Api("产品样本配置") public class MesPartSample extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index 7689354..c356655 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_SCHEDULE_BOM") @Api("生产排程清单") public class MesPartScheduleBom extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 90569c7..8c9277e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -5,6 +5,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import java.io.Serializable; @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PART_STOCK_SCHEDULE") @Api("MES_库存排程配置") public class MesPartStockSchedule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java index c738fc7..3aac5d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PLAN_TAKT") @Api("MES_生产节拍") public class MesPartTakt extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index 627f7c1..0f38fc6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") public class MesPatternJis extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index 445fe79..cd4b446 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN") @Api("PCN节点") public class MesPcn extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java index 2385ff4..08db563 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class MesPcnConnectLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index e5ac585..f9b7fa0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") public class MesPcnSyncCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java index 2b79271..28f3db7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_SYNC_ERRORLOG") @Api("MES_PCN同步异常日志") public class MesPcnSyncErrorLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java index b5d583b..2089bc7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_SYS_USER_OFFLINE") @Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class MesPcnSysUserOffline extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java index a1f1796..025275e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java @@ -4,6 +4,8 @@ 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; @@ -21,6 +23,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_SYSTEM_CFG") @Api("MES_PCN_系统配置") public class MesPcnSystemCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index f22f371..84b51ed 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") public class MesPcnTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java index a9d885f..3f28426 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PCN_TASK_LOG") @Api("mes-pcn定时任务工作清单同步记录") public class MesPcnTaskLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 55bd48c..988a97b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java index db59acd..e301e30 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PLAN_TAKT") @Api("产线节拍表") public class MesPlanTakt extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 43c3535..e0db0e9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.mes.model.ProductDataModel; 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; @@ -26,6 +28,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PLC", indexes = { @Index(columnList = "PLC_CODE"), @Index(columnList = "TAG_ADDRESS") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java index 661059a..fcee248 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROCESS") @Api("工序") public class MesProcess extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 91b3ecd..c845a51 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_BIND_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "KP_SN"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index 6a40ee7..1198b4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_CFG") @Api("产品配置") public class MesProdCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index f769488..178dfe9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_CFG_DETAIL") @Api("产品配置明细") public class MesProdCfgDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java index d648c10..b184cea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_CFG_TYPE") @Api("项目") public class MesProdCfgType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java index 5bcc4c8..d26de9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_MODEL_CFG") @Api("MES_产品车型配置") public class MesProdModelCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index e632e1e..89bd66a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -5,6 +5,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_PACK") @Api("产品包装关系") public class MesProdPack extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index 5fb24e8..c4539bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_ROUTE_CFG") @Api("产品类流程配置表") public class MesProdRouteCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 6913225..2a3b355 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_ROUTE_OPT_PARAM", indexes = { @Index(columnList = "ROUTE_CODE"), @Index(columnList = "PROCESS_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java index 0ccadd4..72ab24e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_SCATTER_CFG_BOM") @Api("散件产品配置明细") public class MesProdScatterCfgBom extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java index 097c8d3..6d430f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_SCATTER_DETAIL") @Api("MES_散件产品配置关系") public class MesProdScatterDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index b463839..901c690 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PROD_WORK_CENTER") @Api("产品工作中心配置") public class MesProdWorkCenter extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java index dff6968..42c6375 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_CATEGORY") @Api("MES_产品位置") public class MesProduceCategory extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index b18781d..d6b1807 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_CTGY_PICTURE") @Api("产品类型图片表") public class MesProduceCtgyPicture extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java index 51f3b81..06a43c3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java @@ -4,6 +4,8 @@ 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; @@ -22,6 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_ERROR_RECORD") @Api("生产异常操作记录") public class MesProduceErrorRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java index 21fbfe9..3e2cf41 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_GROUP") @Api("MES_生产组") public class MesProduceGroup extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java index 0648f2c..b769bf2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_GROUP_CFG") @Api("MES_生产组配置") public class MesProduceGroupCfg extends BaseBean implements Serializable { 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 c8226c2..0bdd015 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 @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_SN", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), 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 0db7bb7..53f9f82 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 @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index cd951ae..e0ce76a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCT_DATA", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java index 0622673..99999ec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCT_ENCODE_CFG") @Api("产品编码配置") public class MesProductEncodeCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index a068cce..5f44783 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_CHECK_DATA", indexes = { @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "SN"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index c215d8b..aa5014b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") public class MesQcCheckStandard extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 20ac65a..fc1d9db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_ORDER") @Api("MES_检验单") public class MesQcOrder extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java index 4e3ceb7..3e62216 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_ORDER_ACCESSORY") @Api("MES_检验单附件") public class MesQcOrderAccessory extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java index 2b8d481..2b963a2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_ORDER_APPROVAL_STATUS") @Api("检测单审批状态表") public class MesQcOrderApprovalStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index e808b1b..59e81a5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_ORDER_DETAIL") @Api("MES_检验单明细") public class MesQcOrderDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java index 6840515..18b932d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QC_ORDER_RECORD", indexes = { @Index(columnList = "QC_ORDER_DETAIL_ID"), @Index(columnList = "SERIAL_NUMBER"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java index 88a7573..f177df0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUALITY_STANDARD") @Api("中航质量标准明细表") public class MesQualityStandard extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java index 1ad2431..b202dce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUALITY_STANDARD_CFG") @Api("质量标准配置") public class MesQualityStandardCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java index cc47d6e..58ef9c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_GROUP_COUNT") @Api("MES_队列分组计数") public class MesQueueGroupCount extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java index dd39bd2..0d7e542 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_GROUP_RULE") @Api("MES_队列分组规则") public class MesQueueGroupRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 8035a05..bc44cc1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIS") @Api("JIS发运队列") public class MesQueueJis extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index 8c8e9bf..494266a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIS_DETAIL") @Api("JIS发运队列明细") public class MesQueueJisDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 1f1b343..a07c327 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -25,6 +25,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_ACTUAL", indexes = { @Index(columnList = "JIS_ACTUAL_NO"), @Index(columnList = "ORGANIZE_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index a73e9fd..7f8ed36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import java.io.Serializable; @@ -29,6 +31,7 @@ import java.io.Serializable; @AllArgsConstructor @Builder @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_ACTUAL_BOM", indexes = { @Index(columnList = "JIS_ACTUAL_NO"), @Index(columnList = "ORGANIZE_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 02a2791..ac002dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -22,6 +22,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @AllArgsConstructor @Builder @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL", indexes = { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index 76bf686..44ccdd1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_PLAN", indexes = { @Index(columnList = "JIS_PLAN_NO"), @Index(columnList = "ORGANIZE_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index 09e3317..ad8be6a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_PLAN_BOM", indexes = { @Index(columnList = "JIS_PLAN_NO"), @Index(columnList = "ORGANIZE_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index 5c2c766..ca66e1a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_PLAN_DETAIL", indexes = { @Index(columnList = "JIS_PLAN_NO"), @Index(columnList = "ORGANIZE_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 755e931..aecb239 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER", indexes = { @Index(columnList = "CUST_FLAG_NO"), @Index(columnList = "ORGANIZE_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index 2742925..ebf2f29 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER_BOM", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "ORDER_NO"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index cf3da4b..97126f7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "SERIAL_NUMBER"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java index 3337e50..c0dfe79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_SHIPPING") @Api("MES_JIT发运队列") public class MesQueueShipping extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index 575899c..4a37695 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_SHIPPING_DETAIL") @Api("MES_JIT发运队列明细") public class MesQueueShippingDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index 0561548..f7cd693 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") public class MesRawPartSn extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java index 22508ff..3bd0d01 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_REAL_TIME_TAKT") @Api("MES_实时节拍") public class MesRealTimeTakt extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java index 4c75791..541aa11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_REPAIR") @Api("维修") public class MesRepair extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index 15600fe..8f461b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_REPAIR_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "CREATE_DATE_TIME"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index a0a107d..0c20dd7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ROUTE") @Api("流程表") public class MesRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index 70d3b44..201b6d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ROUTE_PROCESS") @Api("流程工序关系") public class MesRouteProcess extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index cd9ba33..809725a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ROUTE_PROCESS_CELL") @Api("工序工作单元对照") public class MesRouteProcessCell extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java index 5a75ba4..6efc1ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_ROUTE_PROCESS_STEP") @Api("流程工序工步关系") public class MesRouteProcessStep extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java index 780af83..9d025c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "MES_ROUTE_STATUS") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态") public class MesRouteStatus extends BaseBean implements Serializable { private static final long serialVersionUID = 4988786372428896721L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java index 2249e46..d8fb95d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "MES_SCATTER_BOM_CFG") @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("MES_散件BOM配置") public class MesScatterBomCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java index 44a5022..c657bc2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCATTER_CFG_DETAIL") @Api("MES_散件配置报文关系") public class MesScatterCfgDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java index f1b5039..1e8c51e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCATTER_PART_CFG_BOM") @Api("MES_车型散件配置清单") public class MesScatterPartCfgBom extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index f562fd3..6f941e9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCATTER_PART_PROD_CFG") @Api("MES_散件零件生产配置") public class MesScatterPartProdCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java index 90dd9f3..fc19844 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSchedulingRecord.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCHEDULING_RECORD") @Api("MES_排程记录表") public class MesSchedulingRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java index 0478394..c887cdd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCRAP") @Api("报废原因") public class MesScrap extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 6f4c169..9ff4d6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCRAP_RECORD", indexes = { @Index(columnList = "CREATE_DATE_TIME") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java index 945aa56..55b3700 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SCRIPT_PERSISTENCE") @Api("动态脚本") public class MesScriptPersistence extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 5d27429..b83f6cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java index 0403694..58f6f99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT_CLASS") @Api("MES_班制表") public class MesShiftClass extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java index bd588d7..d20a9be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT_CLASS_DETAIL") @Api("MES_班制班次表") public class MesShiftClassDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index ab59fa1..9715a22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT_GROUP") @Api("班组") public class MesShiftGroup extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index 11f933e..08c1095 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SHIFT_REST") @Api("班次休息信息") public class MesShiftRest extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java index d22f305..9afd745 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SKILLS") @Api("MES_技能表") public class MesSkills extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java index 521d413..0cba794 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SM_ROUTE_OPT_PARAM") @Api("产品流程状态机配置操作参数表") public class MesSmRouteOptParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java index cdef2d5..b725934 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SN_PHOTO_RELATION") @Api("条码照片关系") public class MesSnPhotoRelation extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java index a90ab6f..641f583 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SPC_CONTROL_COEFFICIENT") @Api("MES_SPC控制图系数") public class MesSpcControlCoefficient extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java index f1c2cfd..5774c72 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SPC_KEY_DATA") @Api("MES_SPC关键数据") public class MesSpcKeyData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java index 29ffebf..a3f7d91 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STAFF") @Api("员工信息") public class MesStaff extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java index 63d6212..6362acd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STATE_MACHINE") @Api("MES状态机") public class MesStateMachine extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 08e820a..41c3fb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.mes.model.StepResult; 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STATE_MACHINE_STATUS") @Api("MES状态机步骤") public class MesStateMachineStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index ae19bfc..32ce910 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STATION_BOM") @Api("工位物料清单") public class MesStationBom extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index 7b08457..87ca767 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STEP") @Api("工步") public class MesStep extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java index 48bfc7a..f7200c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STEP_GROUP") @Api("工步集") public class MesStepGroup extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index 1a6f5b7..d2b01b9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -4,6 +4,8 @@ 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; @@ -28,6 +30,7 @@ import java.util.Map; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_STEP_PARAM") @Api("工步参数") public class MesStepParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java index e5f1c82..b539cbc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -4,6 +4,8 @@ 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; @@ -23,6 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SUB_PART") @Api("替代料") public class MesSubPart extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java index 11a7383..7156d25 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -25,6 +27,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_SYNC_DEAD_LETTER", indexes = { @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"), @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java index 3d405cd..311f058 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TAKT_ALARM_CONTINUOUS_CONFIG", indexes = { @Index(columnList = "WORK_CENTER_CODE") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java index 60c3f9f..029df49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TAKT_LEVEL_CONFIG", indexes = { @Index(columnList = "WORK_CENTER_CODE") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java index 3da16b9..a59492f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TAKT_ALARM_RECORD", indexes = { @Index(columnList = "WORK_CENTER_CODE"), @Index(columnList = "START_TIME") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java index 11da3c6..7723322 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java @@ -5,6 +5,8 @@ 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; @@ -19,6 +21,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TIME") @Api("工步参数") public class MesTime extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java index e436ea3..22bbb6c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TOOLING") @Api("MES工装类型") public class MesTooling extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java index ee236fc..e014cf8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TOOLING_ACTION_RECORD") @Api("MES_工装操作记录") public class MesToolingActionRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java index 2deb16a..4ac87d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TOOLING_DETAIL") @Api("MES_工装明细") public class MesToolingDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java index e303080..b5bedc5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index cb53973..42858d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TYPE_CFG") @Api("类型信息表") public class MesTypeCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java index 276699a..5d340b5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_USER_SKILL") @Api("MES_人员技能表") public class MesUserSkill extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java index d8ecd5d..0ae6853 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WC_CHECK") @Api("开线检查") public class MesWcCheck extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java index 36a9394..bf6f943 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WC_CHECK_RECORD", indexes = { @Index(columnList = "CREATE_DATE_TIME") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java index b746ee9..c15873c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCurrentStatus.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WC_CURRENT_STATUS") @Api("工位实时状态表") public class MesWcCurrentStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java index a3ab8a2..7814690 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java @@ -5,6 +5,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WC_EQUIPMENT") @Api("工作单元设备关系表") public class MesWcEquipment extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java index 68b7ee0..6107f00 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WINDOW") @Api("MES_看板界面") public class MesWindow extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java index f51864f..dfd0af0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WINDOW_MODULE") @Api("MES_界面组件配置") public class MesWindowModule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java index 4add812..61bef35 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WINDOW_MODULE_PARAM") @Api("MES_界面组件参数配置") public class MesWindowModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 4e32b80..d257687 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL") @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java index d353601..fe7e8ae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_DEFECT") @Api("MES_工位缺陷") public class MesWorkCellDefect extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java index cd07cd9..911ed12 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_MODULE") @Api("工作单元组件配置") public class MesWorkCellModule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java index 2bb4bcf..6ab124d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_MODULE_PARAM", indexes = { @Index(columnList = "CREATE_DATE_TIME") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index de93034..72d2cc4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -5,6 +5,8 @@ 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; @@ -22,6 +24,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java index c5aaec2..92314e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") public class MesWorkCellParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index 2b85a2b..820118f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_PARAM_CFG") @Api("工作单元参数配置") public class MesWorkCellParamCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 89f73bc..dd254da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_POINT", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "WORK_CENTER_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 400909b..1f8e24f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_POINT_GROUP", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "WORK_CENTER_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java index 153521a..c7e7c7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_SKILL") @Api("MES_工位技能表") public class MesWorkCellSkill extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java index 57704b8..870d363 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_STATUS") @Api("工位运行状态") public class MesWorkCellStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index bebe2dd..416d7cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CENTER") @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java index 38e8073..e7a6ce1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CENTER_MONITOR_LOG", indexes = { @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java index d431ff4..8e9546a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORKDAY") @Api("MES_工作日历表") public class MesWorkDay extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java index 37f87bf..2bd3e0f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_MODULE") @Api("作业程序组件") public class MesWorkModule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java index 08699c4..561e245 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_MODULE_PARAM") @Api("作业程序组件参数") public class MesWorkModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 5ac72a7..6386a1b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_ORDER", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "AREA_CODE"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 18be551..1bff90a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -24,6 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_ORDER_LOG", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "CREATE_DATE_TIME") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java index bfeb9d5..12105de 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java @@ -5,6 +5,8 @@ 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; @@ -27,6 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_START_CACHE") @Api("MES_工单启动池") public class MesWorkStartCache extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java index a043ec9..7fe740a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplate.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_IMPORT_TEMPLATE") @Api("导入模板信息") public class BasImportTemplate extends BaseBean{ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java index 736b6ba..b0be4c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/BasImportTemplateDetails.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_IMPORT_TEMPLATE_DETAILS") @Api("导入模板明细信息") public class BasImportTemplateDetails extends BaseBean{ diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java index e3bf5e0..5d08743 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "IF_PICK_DATA") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("IF_拣货数据") public class IfPickData extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java index 258296d..0e69bc5 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java @@ -5,6 +5,8 @@ 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; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTION_MODULE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("作业组件") public class PtlActionModule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java index 90e4cd7..0f90de3 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTION_MODULE_GROUP") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("组件集") public class PtlActionModuleGroup extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java index e3bd0f0..f02bc31 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTION_MODULE_PARAM") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("组件参数") public class PtlActionModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java index eac7e13..7e593b1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java @@ -4,6 +4,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTION_ROUTE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("作业流程") public class PtlActionRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java index d3bbefe..c074f6f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTOR") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR信息") public class PtlActor extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java index f8fa5fb..20507fe 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ACTOR_RULE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR消息获取规则") public class PtlActorRule extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java index 05de822..3eed4b2 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -5,6 +5,8 @@ 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; @@ -28,7 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域") public class PtlArea extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java index ad66202..99a1751 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java @@ -5,6 +5,8 @@ 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; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_ACTOR_ACTION") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_区域观察者事件配置") public class PtlAreaActorAction extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java index c5a58e1..df61f2d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java @@ -5,6 +5,8 @@ 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; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_ROUTE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域作业流程") public class PtlAreaRoute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java index 34c5e42..ba1f840 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_ROUTE_MODULE_PARAM") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_区域流程组件调用参数") public class PtlAreaRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index 8bed06c..75b2a3e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -4,6 +4,8 @@ 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; @@ -27,7 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_SECTION_TASK") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区段亮灯任务") public class PtlAreaSectionTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java index 3e14e31..5d5704d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_SECTION_TASK_DETAIL") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区段亮灯任务明细") public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index 2df3ce2..a91b4a3 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -4,6 +4,8 @@ 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; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_TASK") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域亮灯任务") public class PtlAreaTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java index b8a8825..7afbfd0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java @@ -4,6 +4,8 @@ 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; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_AREA_TASK_SEQ") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区域任务进度") public class PtlAreaTaskSeq extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 972e412..a871bdf 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.ptl.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_BOM") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) public class PtlBom extends BaseBean implements Serializable { private static final long serialVersionUID = 2676195473413945030L; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java index 3f1c2d1..8426ec5 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_CONFIG") @Api("PTL配置表") public class PtlConfig extends BaseBean implements Serializable { 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 fce2d11..cdd6725 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,6 +5,8 @@ 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; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_CONTROL") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("控制器") public class PtlControl extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java index de26af7..5f775b5 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java @@ -4,6 +4,8 @@ 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; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ELEMENT") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("元素") public class PtlElement extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java index 5763636..158f68a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java @@ -4,6 +4,8 @@ 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; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ELEMENT_ATTRIBUTE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("元素属性") public class PtlElementAttribute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java index ab70950..f716e87 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_IF") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_接口清单") public class PtlIf extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java index 8bde78c..10a6062 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java @@ -4,6 +4,8 @@ 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; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_INTERFACE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("界面") public class PtlInterface extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java index 6412bb4..2450e58 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java @@ -4,6 +4,8 @@ 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; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_INTERFACE_ELEMENT") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("界面元素") public class PtlInterfaceElement extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java index 8a7c756..c57d0f5 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java @@ -4,6 +4,8 @@ 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; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_INTERFACE_ELEMENT_ATTRIBUTE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("界面元素属性") public class PtlInterfaceElementAttribute extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java index eb3e19d..8387854 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java @@ -4,6 +4,8 @@ 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; @@ -23,7 +25,7 @@ import java.util.List; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") public class PtlLabelTemplate extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java index de2c8ac..3eaf1ea 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -24,7 +26,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") public class PtlLabelTemplateParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java index 6a79a55..6f8c41b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_LOG") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_LOG") public class PtlLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java index 3c88059..eeef653 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java @@ -4,6 +4,8 @@ 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; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_MAIN_TASK") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("主任务") public class PtlMainTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java index d273e3e..8ec0c8a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java @@ -4,6 +4,8 @@ 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; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_MAIN_TASK_DETAIL") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("主任务明细") public class PtlMainTaskDetail extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java index cdf49e6..f0e69a9 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_MESSAGE_TYPE") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("消息类型") public class PtlMessageType extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java index 3b9f24f..7fb3553 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_MESSAGE_TYPE_FORMAT") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("消息类型格式") public class PtlMessageTypeFormat extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java index cd2ba93..9eedd02 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java @@ -4,6 +4,8 @@ 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; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_METHOD") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("方法清单") public class PtlMethod extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java index 982dcef..3b15e57 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_OBJECT_DAO") @Api("PTL_对象与dao对应关系") public class PtlObjectDao extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java index 16331af..493be03 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -4,6 +4,8 @@ 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; @@ -24,7 +26,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_PART") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("物料") public class PtlPart extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java index b822a40..0cc37a6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java @@ -4,6 +4,8 @@ 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; @@ -24,7 +26,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN") @Api("PCN节点") public class PtlPcn extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java index f7001d4..8bc9d01 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -5,6 +5,8 @@ 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; @@ -26,7 +28,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @Table(name = "PTL_PCN_CLEAR") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_PCN数据清理") public class PtlPcnClear extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java index e966b3e..780c739 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java @@ -4,6 +4,8 @@ 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; @@ -24,7 +26,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class PtlPcnConnectLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java index 18a7d10..7d4bcc6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,7 +28,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_SYNC_CFG") @Api("PTL_PCN_同步配置") public class PtlPcnSyncCfg extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java index 486b07c..e1b734e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java @@ -4,6 +4,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_SYNC_ERRORLOG") @Api("PTL_PCN同步异常日志") public class PtlPcnSyncErrorLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java index 3f67269..3d2343e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_TASK") @Api("ptl-pcn定时任务工作清单") public class PtlPcnTask extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java index 58d21b7..5261e3f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_PCN_TASK_LOG") @Api("ptl-pcn定时任务工作清单同步记录") public class PtlPcnTaskLog extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java index 4bfd0b9..8b69996 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java @@ -4,6 +4,8 @@ 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; @@ -24,7 +26,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="PTL_PRINTER_CONFIGURE") @Api("打印机配置表") public class PtlPrinterConfigure extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java index 22f7119..8832189 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java @@ -4,6 +4,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="PTL_PRINTING_QUEUE") @Api("待打印队列表") public class PtlPrintingQueue extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java index 6c57df7..9c31083 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_RFID") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_RFID") public class PtlRfid extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java index 9d7dce2..2f9dd95 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ROUTE_MODULE_PARAM") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("PTL_流程组件调用参数") public class PtlRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java index 319d501..913489b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java @@ -5,6 +5,8 @@ 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; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ROUTE_STATUS") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态") public class PtlRouteStatus extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index 4e4d276..23cda83 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -4,6 +4,8 @@ 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; @@ -23,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_ROUTE_STATUS_ERROR_RECORD") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态异常记录") public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java index 0faefbd..00634cf 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -5,6 +5,8 @@ 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; @@ -26,7 +28,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_SECTION") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("区段") public class PtlSection extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java index b504674..733320b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java @@ -5,6 +5,8 @@ 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; @@ -21,7 +23,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_SYNC_DEAD_LETTER", indexes = { @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"), @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java index d07f684..ff09f32 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -27,7 +29,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PTL_SYS_USER_OFFLINE") @Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class PtlSysUserOffline extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index a897694..9111cd0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -5,6 +5,8 @@ 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; @@ -25,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name = "PTL_TAG") -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("标签信息") public class PtlTag extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java index 0f63c84..2cef980 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -26,7 +28,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="PTL_TEST_USER") @Api(value="PTL 测试用户",description = "测试用户") public class PtlTestUser extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java index 7033251..0ae6dc3 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java @@ -5,6 +5,8 @@ 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; @@ -18,7 +20,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_TIME") @Api("工步参数") public class PtlTime extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java index 9fa4fcf..62eed51 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java @@ -4,6 +4,8 @@ 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 org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @Table(name = "SWEB_CONFIG") +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "系统配置", description = "SWEB系统配置") public class SwebConfig extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java index 732fbfb..ce0f43a 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import javax.persistence.Version; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("移库单-明细") public class SwebDocMovementDetails extends BaseBean { private static final long serialVersionUID = -1232334350341792942L; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java index 4a66228..7d33c67 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("移库单-主表") public class SwebDocMovementMaster extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java index 2a28152..30a319d 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("移库单-条码") public class SwebDocMovementSn extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java index c3d0e27..59ace62 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("订单发货通知记录表") public class SwebOrderDeliveryLog extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java index cde67c9..055b8c1 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("物理包装") public class SwebPackage extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java index 7b0b55b..e331e92 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("开口合同主表") public class SwebProcurementPlanOrder extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java index 6e049d3..647d241 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("开口合同明细表") public class SwebProcurementPlanOrderDetails extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java index de0243b..704035a 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("订单修改日志记录表") public class SwebPurchaseChangeLog extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 887b7ea..3038b8e 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("采购订单表-主表") public class SwebPurchaseOrder extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 79d8e38..7a1643d 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("采购订单表-明细表") public class SwebPurchaseOrderDetails extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 0844d3f..5c9e56f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("采购订单表-条码明细表") public class SwebPurchaseOrderSn extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java index 3b26310..ebd1dbe 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("库存需求报警") public class SwebRequireAlarm extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java index fc98a68..997fe7d 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("供应商报警单") public class SwebVendorAlarm extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java index 446612c..3406e85 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("供应商关系表") public class SwebVendorRel extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java index 106d1ee..d935126 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("供应商安全库存") public class SwebVendorStock extends BaseBean { diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java index 9361a39..81e480a 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("供应商供货能力") public class SwebVendorSupplierCapcity extends BaseBean { private static final long serialVersionUID = 2327910806789997252L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 80ee2b6..9bdfa77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "AMP_JIS收货", description = "AMP_JIS收货") public class AmpJisRec extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java index 97aaabd..ecd9cd0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="AMP_PART") @Api("AMP_物料") public class AmpPart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java index f5fde23..447cea5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="AMP_STOCK_CURRENT") @Api("AMP_实时库存表") public class AmpStockCurrent extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 85012a9..cf6566e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户信息表",description = "客户信息表") public class BasCustomer extends BaseBean { 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 583e70a..a370e59 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_VENDOR") @Api("供应商信息") public class BasVendor extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java index 904fd3d..da7d4e1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; @@ -22,6 +24,7 @@ import javax.persistence.*; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"}) }) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java index 18c15f2..e9528e0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Transient; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "SCRIPT_PERSISTENCE_HISTORY") @Api("系统动态脚本") public class EngineScriptPersistenceHistory extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java index 48df648..034f9c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_PP_DETAILS") @Api("MES_生产计划明细表") public class MesPpDetails extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 4ca4350..c60239b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="MES_PP_MASTER") @Api("MES_生产计划主表") public class MesPpMaster extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index 1e942f7..5711261 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -29,6 +31,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="QAD_BOP") +@Inheritance(strategy = InheritanceType.JOINED) @Api("QAD_BOP信息") public class QadBop implements Serializable { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java index b1433df..f9e9e49 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.GenericGenerator; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="QAD_ITEM_PACKING") +@Inheritance(strategy = InheritanceType.JOINED) @Api("零件包装主数据信息") public class QadItemPacking implements Serializable { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java index 5a96543..2c26e98 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "QMS_CHECK_TYPE") @Api("物料子检测项") public class QmsCheckType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java index 566dc2b..2787390 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="QMS_STOCK_SN_EXT_BH") @Api("BH库存条码扩展表") public class QmsStockSnExtBh extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index 835facc..697e01e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="SAP_DOC_FG_SUM") @Api("SAP_产品报工汇总表") public class SapDocFgSum extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java index 4de7f0e..0a34ee8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.GenericGenerator; @@ -28,6 +30,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="SOD_DET") +@Inheritance(strategy = InheritanceType.JOINED) @Api("SOD_DET信息") public class SodDet implements Serializable { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index dff1e11..dcbe79e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="SWEB_PROCUREMENT_PLAN_ORDER", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "VENDOR_CODE"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index 55e2498..78b12b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -28,6 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_WAREHOUSE") @Api("工厂仓库信息") public class WareHouse extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 64708ec..f210869 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_ASN_MASTER", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "ORGANIZE_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 4caf068..9cf635d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_ASN_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 889b2b3..f4f5bd8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -26,6 +28,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_GROUP") @Api("作业流程") public class WmsActionGroup extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 095ae01..b3fa87f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_GROUP_DETAILS") @Api("作业流程明细") public class WmsActionGroupDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index ea59343..e7172db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_LOG") @Api(value = "作业记录表") public class WmsActionLog extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index 76ab86f..06a9880 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="作业记录参数表",description = "作业记录参数表") public class WmsActionLogData extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index a4d878e..1849252 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_LOG_DETAILS") @Api(value = "作业记录明细表", description = "作业记录表") public class WmsActionLogDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index d0a79d7..3c4a3fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_MODULE") @Api("作业步骤处理组件") public class WmsActionModule extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index 1923bb0..c9dddca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_MODULE_PARAM") @Api("作业步骤处理组参数") public class WmsActionModuleParam extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 8144c65..064a9de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="作业步骤信息",description = "作业步骤信息") public class WmsActionStep extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index c354a66..358dd4b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -25,6 +27,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ACTION_STEP_CALL", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "AS_ID"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index 41ceb88..6c748fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "作业步骤调用参数表", description = "作业步骤调用参数表") public class WmsActionStepCallParam extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java index 4f8536b..28df3f9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -5,6 +5,8 @@ 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "作业步骤类型信息", description = "作业步骤类型信息") public class WmsActionStepType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index 12f5c0e..1953b63 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="责任区域分配信息",description = "责任区域分配信息") public class WmsAreaOwner extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java index 61a450f..b26b237 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -33,6 +35,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "无人叉车任务明细", description = "喜德无人叉车任务明细") public class WmsAutoForkCallBackDetails extends BaseBean { private static final long serialVersionUID = -8103992000562208799L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java index e5fb349..675807c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -29,6 +31,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_AUTO_STRATEGY_DETAIL", indexes = { @Index(columnList = "AUTO_STRATEGY_NO"), @Index(columnList = "STRATEGY_ITEM_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java index 9a4437d..0c7f53b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_AUTO_STRATEGY_MASTER", indexes = { @Index(columnList = "STRATEGY_NO"), @Index(columnList = "ROUTING_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java index 31f0174..c945ab8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_AUTO_STRATEGY_METHOD", indexes = { @Index(columnList = "STRATEGY_ACTION") }) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java index 640c0d4..639d463 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "自动任务日志", description = "自动任务日志") public class WmsAutoTaskLog extends BaseBean { private static final long serialVersionUID = -7839329617395574378L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index 649bea3..ab2f3a5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_BH_CHILD_DETECTION_ITEM") @Api("BH子检测项") public class WmsBhChildDetectionItem extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index edb96e4..8511863 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -32,6 +34,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物料清单", description = "物料清单") public class WmsBom extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java index 88525bb..c74ebb7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -32,6 +34,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "bom历史记录", description = "bom历史记录") public class WmsBomHistory extends BaseBean { private static final long serialVersionUID = -2781401699752981565L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index a2488f6..478ebfd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_BOM_TOTAL") @Api("全量BOM") public class WmsBomTotal extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index 3657a64..4cc03bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_BUSI_TYPE") @Api("业务类型信息") public class WmsBusiType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java index f8b58d3..5ed3c99 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_CS_ADJUST_RANGE") @Api("盘点调差范围信息") public class WmsCSAdjustRange extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 69772a7..0f92e3d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_CS_FACTTRANS") @Api("盘点实盘信息") public class WmsCSFactTrans extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java index 02314f0..df17fea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_CS_LOCATE") @Api("盘点库位信息") public class WmsCSLocate extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 85b257d..ee1f1d8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_CS_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "VENDOR_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index f6030f5..8a82a3c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -28,6 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_CS_ORDER") @Api("盘点单主表信息") public class WmsCSOrderMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java index a85ae4a..52136d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java @@ -5,6 +5,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_CS_PART") @Api("盘点区物料信息") public class WmsCSPart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 70d8791..2b45dc9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_CS_RANGE") @Api("盘点范围信息") public class WmsCSRange extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java index 42e1250..4a7c639 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_CS_ZONE") @Api("盘点存储区信息") public class WmsCSZone extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index ebdce7a..afcc787 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_CAR") @Api("车辆信息") public class WmsCar extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index f39695e..19ffd3e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_IB_CHECK_FACT") @Api("抽点记录信息") public class WmsCheckFactRecord extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java index e07cb5f..0aba7f1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="COI对照表",description = "COI对照表") public class WmsCoi extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java index 341533f..7643f8a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_CONFIG") @Api(value="系统配置",description = "WMS系统配置") public class WmsConfig extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java index 5529e33..7fca097 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_CONTAINER_TYPE") @Api("容器类型") public class WmsContainerType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 4933c46..91654d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -31,6 +33,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "盘点策略表", description = "盘点策略表") public class WmsCsStrategy extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java index 95e581d..9fd8b1c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户窗口时间",description = "客户窗口时间") public class WmsCustWindow extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java index 3e7e870..a5f88d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户零件关系表",description = "客户零件关系表") public class WmsCustomerPart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java index a071ed1..337077d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户物料发往地",description = "客户物料发往地") public class WmsCustomerPartShipping extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index 1995c1c..bcba788 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="数据权限信息",description = "数据权限信息") public class WmsDataAuth extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java index 34ed123..33a9b4e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DATA_MIGRATION_CONFIG") @Api("WMS数据迁移配置表") public class WmsDataMigrationConfig extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 935bcc4..b27a164 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_FG_DETAIL") @Api("WMS_产品报工明细信息") public class WmsDocFgDetail extends BaseBean { 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 8eb4c27..7d27d82 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 @@ -9,6 +9,8 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,15 +30,13 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_MOVEMENT_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @Index(columnList = "SRC_NO"), @Index(columnList = "ORGANIZE_CODE") }) -@Inheritance( - strategy = InheritanceType.JOINED -) @Api("移库单明细表") public class WmsDocMovementDetails extends BaseBean { private static final long serialVersionUID = -4800308354250386102L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index a0c032c..8f1226a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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 lombok.ToString; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_MOVEMENT_MASTER", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "REF_NO"), @@ -35,9 +38,6 @@ import java.util.List; @Index(columnList = "BUSI_TYPE"), @Index(columnList = "ORGANIZE_CODE") }) -@Inheritance( - strategy = InheritanceType.JOINED -) @Api("移库单表") @ToString public class WmsDocMovementMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index b9a406b..abae0c0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,15 +28,13 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_MOVEMENT_SN", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @Index(columnList = "SN"), @Index(columnList = "ORGANIZE_CODE") }) -@Inheritance( - strategy = InheritanceType.JOINED -) @Api("移库条码信息") public class WmsDocMovementSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index 8457f27..a247f85 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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 lombok.ToString; import org.hibernate.annotations.ColumnDefault; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_SO_DETAILS") @Api("销售订单明细表") @ToString diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java index 89fb7e6..ba64098 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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 lombok.ToString; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_SO_MASTER") @Api("销售订单主表") @ToString diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java index f48da84..de3eb36 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOCK") @Api("道口预约信息") public class WmsDock extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java index d8dd810..1139aeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOCK_ORDER_INFO") @Api("道口预约信息") public class WmsDockOrderInfo extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java index 4ccaabf..0757eca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOCK_WINDOW_TIME") @Api("道口窗口时间") public class WmsDockWindowTime extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java index ba7a2b7..b7d22d0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ENUM") @Api("数据字典-枚举") public class WmsEnum extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 66d6249..13630ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_FG_INSTOCK") @Api("产品入库信息") public class WmsFGInStock extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java index 4a71d08..8a577f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java @@ -4,6 +4,8 @@ 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; @@ -22,6 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_FILE", uniqueConstraints = {@UniqueConstraint(columnNames = {"FILE_NAME", "REF_SRC", "REF_TYPE"})}) @Api("附件信息") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java index bb4ab7b..f94f8fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_FIX") @Api("WMS设备信息") public class WmsFix extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java index f64bf33..8564ccb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_FURNITURE") @Api("家具表") public class WmsFurniture extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java index d9dd033..920a6c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_FURNITURE_TYPE") @Api("家具类型表") public class WmsFurnitureType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java index 2ef602d..d163189 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度指标",description = "仓库健康度指标") public class WmsHealthIndicator extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java index 317c3e9..084f03c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度指标分级",description = "仓库健康度指标分级") public class WmsHealthIndicatorLevel extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java index f5d7d59..b62f75d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度指标结果",description = "仓库健康度指标结果") public class WmsHealthIndicatorResult extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java index d3572e5..5d078f4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度变量",description = "仓库健康度变量") public class WmsHealthVariable extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java index cd066ab..aba0dee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库健康度变量测算结果",description = "仓库健康度变量测算结果") public class WmsHealthVariableResult extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index 3e63579..800d4fe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="抽点比例表",description = "抽点比例表") public class WmsIbCheckPlan extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java index afc6da3..ff022ef 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="线边库物料信息",description = "线边库物料信息") @Deprecated public class WmsLineLocatePart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 1cfd31a..f66fa49 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -34,6 +36,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库位表", description = "库位表") public class WmsLocate extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 86f2fe7..0a500ac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库位物料表", description = "库位物料表") public class WmsLocatePart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java index 0f53480..5a2b332 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流费用记录") public class WmsLogisticExpenseRecords extends BaseBean { private static final long serialVersionUID = 6512855224667052310L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java index 711686f..ef26044 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -29,6 +31,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流费用记录明细") public class WmsLogisticExpenseRecordsDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java index acc1cb6..5b94590 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -29,6 +31,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流费用管理") public class WmsLogisticsCosts extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java index c641bc9..f038805 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_LOGISTICS_FREIGHT_APPROVAL") @Api("物流运费审批") public class WmsLogisticsFreightApproval extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java index d4dd9d5..9d910e9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "运输方式", description = "运输方式") public class WmsModeTransport extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index f115c0a..2ae023d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -32,6 +34,7 @@ import javax.persistence.Version; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_DETAILS", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 7d51f82..10c0680 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_MASTER", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index d34360f..889e64c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import javax.persistence.Version; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_SN", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 5c7fdeb..9f83850 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_TO_ERP", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index aa73f97..771f78b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_OP_TYPE") @Api("作业类型") public class WmsOpType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java index 2260cd7..8463307 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.NoArgsConstructor; import java.io.Serializable; 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 00f26d8..367b62e 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_PO_MASTER", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "ORGANIZE_CODE") 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 8eb49bb..b10c820 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -31,6 +33,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_PO_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java index 98f1b1b..625753b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="包装箱条码表",description = "包装箱条码表") public class WmsPackSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java index 8b08f24..16d17ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PACKAGE") @Api("物理包装信息") public class WmsPackage extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 1d9ed2e..6494e00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PACKAGE_SPEC") @Api("包装规格") public class WmsPackageSpec extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 37d66bb..2b43ce5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -31,6 +33,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORGANIZE_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java index 90a60c4..d56ff82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "零件装换信息", description = "零件装换信息") public class WmsPartChange extends BaseBean { private static final long serialVersionUID = -2857107665974689720L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 57acbe8..00b2a5d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART_CHECK_TYPE") @Api("物料检测大类") public class WmsPartCheckType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index d382a00..ca32ae5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART_EXTEND", indexes = { @Index(columnList = "ORGANIZE_CODE") }) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java index 5265509..9b96499 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PART_GROUP") @Api("物料组信息") public class WmsPartGroup extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java index d2e7f87..e750735 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PART_GROUP_DETAILS") @Api("物料组明细信息") public class WmsPartGroupDetails extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java index 80cc3af..3c846ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PART_GROUP_ROUTE") @Api("物料组物流路线信息") public class WmsPartGroupRoute extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index b6099d9..5db1046 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART_ITEM_CHECK") @Api("物料子检测项") public class WmsPartItemCheck extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java index 2896d6e..da81e19 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PART_PACKAGE") @Api("物料包装关系") public class WmsPartPackage extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java index 1a083df..50f38ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="物料关系表",description = "物料关系表") public class WmsPartRelation extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java index 6d68047..30173d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -4,6 +4,8 @@ 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; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="物料线路关系表",description = "物料线路关系表") public class WmsPartRouting extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java index 236cf72..9ac4b1c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java @@ -5,6 +5,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PICK_COUNT") @Api("供应商物料每月数量") public class WmsPickCount extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java index 2b7f8b9..0880a11 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PICKING_WINDOW_TIME") @Api("领料时长分区") public class WmsPickingWindowTime extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java index b2d9ee2..d089328 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PLC") @Api("WMSPLC配置表") public class WmsPlc extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 7d9a8fc..102931b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_DOC_PO_SN", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java index 7c8bf61..4677311 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PRINTER_CONFIGURE") @Api("打印机配置表") public class WmsPrinterConfigure extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index 69724ce..db0a2af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PRINTING_QUEUE") @Api("待打印队列表") public class WmsPrintingQueue extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java index e7c329b..f01a5ad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PROCUREMENT_PLAN_CONTRACT") @Api("开口合同PO关系表") public class WmsProcurementPlanContract extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java index a90107b..95ced68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PROD_CFG_TYPE") @Api("项目信息") public class WmsProdCfgType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java index e415a70..772a940 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import java.io.Serializable; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java index 3baae85..e994f4c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PRODUCT_VERSION") @Api("生产版本") public class WmsProductVersion extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java index fefe223..849530d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流供应商关系", description = "库存物流供应商关系条码信息") public class WmsProviderFlag extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java index 0783140..26ebc61 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PULL_RULE") @Api("拉动规则") public class WmsPullRule extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index eccb351..09b3eb7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PULL_TASK_DETAILS") @Api("WMS_拉动计划任务明细表") public class WmsPullTaskDetails extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java index 00fa875..bfa2f45 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_PULL_TASK_MASTER") @Api("WMS_拉动计划任务主表") public class WmsPullTaskMaster extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java index 8691970..62fa603 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java @@ -7,6 +7,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PURCHASE_PLAN_HISTORY") @Api("采购计划历史") public class WmsPurchasePlanHistory extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index bcfd661..1c6cb1d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -4,6 +4,8 @@ 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; @@ -22,6 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PUSH_CONFIG") @Api("推送配置") public class WmsPushConfig extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java index b8ef2ab..3265282 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_PUSH_LOG") @Api("推送日志") public class WmsPushLog extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index ffde294..ea6576a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import javax.persistence.Version; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_QC_DETAILS") @Api("质检单明细信息") public class WmsQCDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index f2131f6..86c72f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_QC_MASTER") @Api("质检单主表信息") public class WmsQCMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java index f05689d..422ff94 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_QC_SN_ERROR_LIST", indexes = { @Index(columnList = "ORGANIZE_CODE"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index d02e9b0..339464e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_QC_TRANS") @Api("质检单操作明细信息") public class WmsQCTrans extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java index 8efb843..2e813f4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_RFID_OPERATE_RECORD") @Api("RFID条码操作记录表") public class WmsRfidOperateRecord extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java index 67c0edd..c33521f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="物流线路信息表",description = "物流线路信息表") public class WmsRouting extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java index c4f0157..71633b0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ROUTING_ASSIGN") @Api("物流路线分配表") public class WmsRoutingAssign extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java index 4fe577d..eda93fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ROUTING_DETAIL") @Api("物流路线明细表") public class WmsRoutingDetail extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java index db8be1d..31f515c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_ROUTING_MASTER") @Api("物流路线主表") public class WmsRoutingMaster extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 4bf40f2..a03e599 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="物流线路规则表",description = "物流线路规则表") public class WmsRoutingRule extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 87c12d1..e36d958 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "SAP_ORDER_LOCK") @Api("SAP_单据锁定") public class WmsSapOrderLock extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java index 8723563..7437761 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -9,6 +9,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -37,6 +39,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "产品条码信息", description = "产品条码信息") public class WmsSerialSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index b59daf8..3c36fe5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -30,6 +32,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_SERIAL_SN_TRANS") @Api("产品条码事务表") public class WmsSerialSnTrans extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java index 0e015db..abc3bbb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_SERVICE_LOG") @Api("服务调用详细日志") public class WmsServiceLog extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java index 0e4d99f..4c499e7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_SHIFT") @Api("班次信息") public class WmsShift extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java index 103808a..e91836e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_SHIFT_REST") @Api("班休信息") public class WmsShiftRest extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 46b0051..774ae39 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_DOC_SHIPPING") @Api("产品发运信息") public class WmsShipping extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java index ff6c631..a7738bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="客户发往地信息表",description = "客户发往地信息表") public class WmsShippingFlag extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java index 928d2d4..9b104d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -29,6 +31,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流费用管理") public class WmsShortLogisticsCosts extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 0ef223b..7b2cb55 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="条码操作记录表",description = "条码操作记录表") public class WmsSnOperateRecord extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java index 0b7ae2f..32c2cce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_SN_PRINT") @Api("打印队列信息") public class WmsSnPrint extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java index d48a771..97fab1a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "条码补打印记录表", description = "条码补打印记录表") public class WmsSnPrintRcd extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index 9ee5464..dd5b91c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_STOCK_INITIALIZE") @Api("库存初始化信息") public class WmsStockInitialize extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index b57e05f..b1335f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -35,6 +37,7 @@ import java.util.Map; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存信息", description = "库存信息") public class WmsStockQuan extends BaseBean { 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 4084304..8689812 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 @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -49,6 +51,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存条码信息", description = "库存条码信息") public class WmsStockSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java index dfe3b86..779895c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_SUB_PART", indexes = { @Index(columnList = "ORGANIZE_CODE") }) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java index 05a6e33..ac52c32 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.apache.commons.lang3.StringUtils; import org.hibernate.annotations.DynamicInsert; @@ -33,6 +35,7 @@ import java.util.Map; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_SUSPEN_STOCK_SYNC", indexes = { @Index(columnList = "ORGANIZE_CODE") }) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java index 95e23ab..c9593f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TASK_CREATE_LOG") @Api("作业任务生成日志表") public class WmsTaskCreateLog extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 522d086..3ad127e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -31,6 +33,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TASK_DETAILS", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 79bab3b..31ac6d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TASK",indexes = { @Index(columnList = "TASK_STATUS"), @Index(columnList = "TRANS_TYPE_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index 9927324..d2e158d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TASK_SRC") @Api("作业任务数据来源表") public class WmsTaskSrc extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java index d35daea..ba99c80 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TMP_ORDER_LOCK") @Api("单据操作并发锁定信息") public class WmsTempOrderLock extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java index 6d7bec2..4e14b9d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -26,6 +28,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TERMINAL") @Api("工位信息") public class WmsTerminal extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index f8f6db9..1a2e7d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -33,6 +35,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api("检测结果明细表") public class WmsTestResultDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 29121cc..150116a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TEST_RESULT_SUMMARY") @Api("检测结果汇总表") public class WmsTestResultSummary extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java index fdcf3d7..b315365 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_THYMELEAF") @Api("WMS回显模板数据") public class WmsThymeleaf extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java index ffbfba7..78b338f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TMS_DRIVER") @Api("驾驶员信息") public class WmsTmsDriver extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index 4b47141..e0654fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel; 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; @@ -28,6 +30,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TMS_SHIPPING_EXT") @Api("装车单信息") public class WmsTmsShippingExt extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java index 2935a37..08a1033 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="策略表",description = "策略表") public class WmsTractics extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 5818f82..19d71a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="库存交易记录表",description = "库存交易记录表") public class WmsTrans extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java index 026c7ab..d4de6d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="交易代码方法表",description = "交易代码方法表") public class WmsTransCode extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java index be80316..059fcff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "交易处理组件表", description = "交易处理组件表") public class WmsTransModule extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 14fbf1f..26fabac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TRANS_QUAN", indexes = { @Index(columnList = "WH_NO"), @Index(columnList = "ZONE_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index fe49873..a1b49d0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -29,6 +31,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="仓库交易归档表",description = "仓库交易归档表") public class WmsTransRcd extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index b4f5ed5..567b256 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_TRANS_SN") @Api("库存交易条码信息") public class WmsTransSn extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 7051b98..28e7b60 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -30,6 +32,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "交易类型表", description = "交易类型表") public class WmsTransType extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index aecde2e..9dad565 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -31,6 +33,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_TRANSPORT_RULE") @Api("运输规则表") public class WmsTransportRule extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 84ce516..ed41e05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="单位定义",description = "单位定义") public class WmsUnit extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 3c3cf1e..5da5bd1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -32,6 +34,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="单位换算",description = "单位换算") public class WmsUnitConvert extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java index e438613..4a4a21f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorDock.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_VENDOR_DOCK") @Api("供应商道口信息") public class WmsVendorDock extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index bcd0499..ee2ea45 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "供应商零件关系", description = "供应商零件关系") public class WmsVendorPart extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java index ee0536c..31e174d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="供应商计划员",description = "供应商计划员") public class WmsVendorPlanner extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java index fa72ef5..0cdbd64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="供应商父子关系",description = "供应商父子关系") public class WmsVendorRelation extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java index 4902c6a..10e60d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java @@ -4,6 +4,8 @@ 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; @@ -25,6 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="供应商窗口时间",description = "供应商窗口时间") public class WmsVendorWindow extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java index dad3549..f097008 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -27,6 +29,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_WAVE_RULE") @Api(value = "波次规则数据表") public class WmsWaveRule extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java index 360d029..9ebabdf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_WAVE_RULE_DETAILS") @Api(value = "波次规则明细数据表") public class WmsWaveRuleDetails extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index 79b7084..91de6b5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="工作中心",description = "工作中心") public class WmsWorkCenter extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java index 1a792c6..0753668 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -27,6 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="工作中心线边库区关系",description = "工作中心线边库区关系") public class WmsWorkCenterZone extends BaseBean { private static final long serialVersionUID = 950689993212839817L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java index 3b1566e..921635f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_ZONE_PART") @Api("库区物料") public class WmsZonePart extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 3c2b908..676d2e2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -29,6 +31,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "存储区信息表", description = "存储区信息表") public class WmsZones extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index d7c87ee..be8e419 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -4,6 +4,8 @@ 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; @@ -30,6 +32,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "WMS字段信息表", description = "WMS字段信息表") public class WmsFieldInfo extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java index 0ffdd1d..b5bde49 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java @@ -4,6 +4,8 @@ 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="WMS列表元素表",description = "WMS列表元素表") public class WmsListElement extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java index 9a6f4b8..d06d706 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java @@ -4,6 +4,8 @@ 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; @@ -30,6 +32,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="WMS列表元素菜单关系表",description = "WMS列表元素菜单关系表") public class WmsListElementFunction extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java index 7a9cbbb..09ed3de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java @@ -4,6 +4,8 @@ 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; @@ -28,6 +30,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="WMS搜索元素表",description = "WMS搜索元素表") public class WmsSearchElement extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java index b400277..46e69c0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java @@ -4,6 +4,8 @@ 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; @@ -31,6 +33,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value="WMS搜索元素菜单关系表",description = "WMS搜索元素菜单关系表") public class WmsSearchElementFunction extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java index af83020..6bac44c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_PLUGIN") @Api("插件信息") public class BasPlugin extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java index d2f97fd..a77cc36 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPluginClass.java @@ -3,6 +3,8 @@ 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; @@ -23,6 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_PLUGIN_CLASS") @Api("插件类信息") public class BasPluginClass extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java index 8a1e6b4..691c19a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java @@ -11,7 +11,11 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; import java.io.Serializable; @Data diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java index 1a5b744..c5d5f38 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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; @@ -16,6 +18,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_CHECK_POINT") public class WmsCheckPoint extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java index f830b47..f3c460b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -26,6 +28,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_MOVE_DETAILS_SNAPSHOT", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java index bf4419e..9d71d9b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -23,6 +25,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_MASTER_SNAPSHOT", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index fc673d5..a4f2d6f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -28,6 +30,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name = "WMS_MOVE_SN_SNAPSHOT", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index c927e7d..97f7c7f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -31,6 +33,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存信息", description = "库存信息") public class WmsStockQuanSnapshot extends SnapshotBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index 62a730f..b00ddde 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -43,6 +45,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存条码信息", description = "库存条码信息") public class WmsStockSnSnapshot extends SnapshotBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java index c77e082..f300adf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_ERP_COGI_SNAPSHOT", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "AREA_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java index 9171ffb..b0cc952 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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; @@ -23,6 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_ERP_CHECK_POINT") public class WmsErpCheckPoint extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java index bb1812d..8cc10d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_ERP_INTERFACE_SNAPSHOT", indexes = { @Index(columnList = "SID"), @Index(columnList = "SENDER"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java index 26af6b4..a0a52fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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; @@ -23,6 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_ERP_QUAN_AREAS") public class WmsErpQuanAreas extends BaseBean implements Comparable { private static final long serialVersionUID = 5560607687871639209L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java index ac326b4..4806f04 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_ERP_STOCK_QUAN_SNAPSHOT", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "AREA_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java index e0a51d0..5ac2e62 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="WMS_ERP_TRANS_SNAPSHOT", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java index 81f5de7..4b5934f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -4,6 +4,8 @@ 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; @@ -26,6 +28,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_IMPORT_TEMPLATE") @Api("导入模板信息") public class BasImportTemplate extends BaseBean{ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java index d45be01..6657fad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -4,6 +4,8 @@ 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; @@ -24,6 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) @Table(name="BAS_IMPORT_TEMPLATE_DETAILS") @Api("导入模板明细信息") public class BasImportTemplateDetails extends BaseBean{ From 45201c42d38c11b245cafc00568d6084a2096250 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 13 Dec 2020 22:50:14 +0800 Subject: [PATCH 244/329] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BC=98=E5=8C=96?= 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 5ad1a0b..02bb4db 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 @@ -1656,6 +1656,11 @@ public class WmsEnumUtil { return description; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From 230895c243e094ccfd28d9131d1094ff6540cea0 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 14 Dec 2020 01:05:11 +0800 Subject: [PATCH 245/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE=E9=A2=98?= 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 | 4 ++++ 1 file changed, 4 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 5ad1a0b..61bd2a7 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 @@ -1665,6 +1665,10 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /** From 56876e8cba0160068dc980ba5cf36d4055c06ab6 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 14 Dec 2020 01:12:01 +0800 Subject: [PATCH 246/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE=E9=A2=98?= 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 | 4 ---- 1 file changed, 4 deletions(-) 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 f1c6e55..02bb4db 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 @@ -1670,10 +1670,6 @@ public class WmsEnumUtil { } return tmp; } - - public static String valueOfDescription(int val) { - return valueOf(val); - } } /** From 08a458cee2e61374d0f76411d2e61376f17c83d1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 14 Dec 2020 12:38:57 +0800 Subject: [PATCH 247/329] unpack --- .../i3plus/pojo/mes/model/DataReviewModel.java | 7 +-- .../i3plus/pojo/mes/model/PackageUnPackModel.java | 50 ++++++++++++++++++++++ 2 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 77997e5..55cf9e7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -40,10 +40,7 @@ public class DataReviewModel { @ApiParam("显示标识") private String showFlag; - @ApiParam("关键件颜色") - private String keyPartColor; - - @ApiParam("生产数据颜色") - private String prodDataColor; + @ApiParam("颜色") + private String color; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java new file mode 100644 index 0000000..1ae1fbe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: UNPACK + * @Reference: + * @Author: wangjie + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class PackageUnPackModel { + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("包装条码") + private String packageNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("批次") + private String lotNo; + + @ApiParam("状态") + private Integer status; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("更新时间") + private String modifyDatetime; + + @ApiParam("包装数量") + private String partSpecQty; + + @ApiParam("UNPACK数据") + private List unPackList; +} From b695ab2fc3a17b2d901481dd1c70bc0ff0eced28 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 14 Dec 2020 13:21:37 +0800 Subject: [PATCH 248/329] =?UTF-8?q?=E3=80=9010202=2020011--=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E4=B8=80=E6=AD=A5=E6=B3=95=E9=85=8D=E6=96=99=E6=97=B6?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 6a02dc3..11c983d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -270,6 +270,10 @@ public class WmsDocMovementMaster extends BaseBean { isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue") private String fourthRemake; + @Column(name = "IS_REMOVE_ORDER") + @ApiParam(value = "是否撤销单据") + private Integer isRemoveOrder = CommonEnumUtil.FALSE; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; From 34678930516934122e8f3c4d4415f797292c4f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 14 Dec 2020 18:19:18 +0800 Subject: [PATCH 249/329] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E5=BA=93=E5=AD=98=E4=B8=8D=E5=87=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B0=86=E6=89=80=E6=9C=89stockquan?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84=E5=9C=B0=E6=96=B9=E6=94=B9=E4=B8=BA?= =?UTF-8?q?set=20qty+=3DnewQty=E5=BD=A2=E5=BC=8F=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E5=B9=B6=E5=8F=91=E6=89=A7=E8=A1=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E8=84=8F=E8=AF=BB=202.=E6=9B=B4=E6=AD=A3=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AF=B9=E8=B1=A1=E5=B1=9E=E6=80=A7woekorder?= =?UTF-8?q?No->workOrderNo=203.=E5=B0=86=E8=84=9A=E6=9C=AC=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=BE=80=E5=A4=96=E6=8A=9B=204.=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E8=84=9A=E6=9C=AC=E6=8E=A5=E5=8F=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/MesPpDetails.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 6 +++--- .../main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java index 1b0f248..15851ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -31,9 +31,9 @@ public class MesPpDetails extends BaseBean{ private static final long serialVersionUID = 9214639813072592727L; - @Column(name="WROKORDER_NO") + @Column(name="WORK_ORDER_NO") @ApiParam("工单号") - private String woekorderNo; + private String workOrderNo; @Column(name="ITEM") @ApiParam("行号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 0195b14..58bf723 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -33,10 +33,10 @@ public class MesPpMaster extends BaseBean{ private static final long serialVersionUID = 9214639813072592726L; - @Column(name="WROKORDER_NO") + @Column(name="WORK_ORDER_NO") @ApiParam("工单号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) - private String woekorderNo; + private String workOrderNo; @Column(name="PDLINE_NO") @ApiParam("产线代码") @@ -95,7 +95,7 @@ public class MesPpMaster extends BaseBean{ private String remark; @Column(name = "WORK_ORDER_PLAN_STATUS", columnDefinition = "int default 10") - @ApiParam("工单计划状态:10-创建，20-处理中，30-已关闭") + @ApiParam("工单计划状态") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS") private Integer workOrderPlanStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java index 697f6dd..4db6547 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java @@ -22,7 +22,7 @@ public class MesPpTemplate extends BaseBean { @ApiParam(value = "工单号") @AnnoOutputColumn - private String woekorderNo; + private String workOrderNo; @ApiParam(value = "产线代码") @AnnoOutputColumn diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 37d66bb..407ff15 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -143,7 +143,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, isMultiple = 1, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String partGroup; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index eccb351..107060b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -31,9 +31,9 @@ public class WmsPullTaskDetails extends BaseBean{ private static final long serialVersionUID = 9214639813072592736L; - @Column(name="WROKORDER_NO") + @Column(name="WORK_ORDER_NO") @ApiParam("工单号") - private String woekorderNo; + private String workOrderNo; @Column(name="ITEM") @ApiParam(value = "行号", example = "0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java index 00fa875..b98f880 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -32,10 +32,10 @@ public class WmsPullTaskMaster extends BaseBean{ private static final long serialVersionUID = 9214639813072592736L; - @Column(name="WROKORDER_NO") + @Column(name="WORK_ORDER_NO") @ApiParam("工单号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String woekorderNo; + private String workOrderNo; @Column(name="PDLINE_NO") @ApiParam("产线代码") 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 f10ed68..8a218f9 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 @@ -2862,7 +2862,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlMesPpMaster(MesPpMaster mesPpMaster) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(mesPpMaster.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringLikerPack(mesPpMaster.getWorkOrderNo(), "workOrderNo", result); DdlPreparedPack.getNumEqualPack(mesPpMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(mesPpMaster.getPdlineNo(), "pdlineNo", result); DdlPreparedPack.getStringBiggerPack(mesPpMaster.getStartProductTime(), "startProductTime", result); @@ -2883,7 +2883,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(mesPpDetails.getPartNo(), "partNo", result); - DdlPreparedPack.getStringEqualPack(mesPpDetails.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringEqualPack(mesPpDetails.getWorkOrderNo(), "workOrderNo", result); getStringBuilderPack(mesPpDetails, result); @@ -2910,7 +2910,7 @@ public class WmsHqlPack { } DdlPreparedPack.getInPackList(integerList, "orderStatus", result); - DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWorkOrderNo(), "workOrderNo", result); DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result); DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result); DdlPreparedPack.getStringSmallerPack(wmsPullTaskMaster.getEndProductTime(), "endProductTime", result); @@ -2928,7 +2928,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWorkOrderNo(), "workOrderNo", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result); getStringBuilderPack(wmsPullTaskDetails, result); From 3d1d05ef1c7314f63bd18876d01a367d3c15afe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 14 Dec 2020 19:53:51 +0800 Subject: [PATCH 250/329] =?UTF-8?q?1.=E5=A4=A9=E6=B4=A5=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 57e0a76..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 5730ec1..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 04f33d2..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 42a8d25..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index bc6545f..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index d68e1ab..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 891ddeb..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c169cc4..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 860f573..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index fe03472..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 2b2428f..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 6eab360..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index de71a5d..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 51a2226..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 4e15179..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0c96be2..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 47eeb2a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 90165f3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 6cd210c..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index f3a601d..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0.0.1 + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 271e23a..f611147 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0.0.1 + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From ae2469e46354b26592f745de7d94548c31a25a4b Mon Sep 17 00:00:00 2001 From: liangyao Date: Tue, 15 Dec 2020 15:33:05 +0800 Subject: [PATCH 251/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index bf6b522..6f4cf89 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -433,5 +433,6 @@ public class WmsDocMovementMaster extends BaseBean { this.createUser = createUser; this.assignPlanDate = planDate; this.assignPlanTime = planTime; + } } From 4116dc6b914337e50abf22b73676941179020a62 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 15 Dec 2020 19:18:05 +0800 Subject: [PATCH 252/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 49ad9fc..90446fd 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 @@ -801,7 +801,7 @@ public class WmsEnumUtil { SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"), SCATTERED_IN(60, "SCATTERED_IN", "零星入库"), NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"), - SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR + SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货(DMR)"),//默认DMR CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"), PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"), INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"), From c0d3eb807f0f7c611995da3ff4307fec035b26ee Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 16 Dec 2020 13:40:34 +0800 Subject: [PATCH 253/329] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MaterialLotModel.java | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java new file mode 100644 index 0000000..a7c562e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/15 5:34 PM + * @Modify: + */ +@Data +public class MaterialLotModel implements Serializable { + + private static final long serialVersionUID = -3438339005176732840L; + private Long id; + private String sn; + private String modifyDateTime; + + @ApiParam("生产日期") + private String dateCode; + + @ApiParam("特殊批次") + private String lotNo; + + private String fixLotNo; + private String leftCode; + private String partNo; + private String partName; + private String qty; + private String srcWhNo; + private String srcZoneNo; + private String srcLocateNo; + +} From 95e92168d9db47a86e74fabdb29290dec1fde424 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 16 Dec 2020 15:18:36 +0800 Subject: [PATCH 254/329] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=BF=BD=E6=BA=AF?= =?UTF-8?q?=E6=89=B9=E6=AC=A1model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/MaterialLotModel.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java index a7c562e..bc8a783 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java @@ -16,22 +16,39 @@ public class MaterialLotModel implements Serializable { private static final long serialVersionUID = -3438339005176732840L; private Long id; + @ApiParam("条码") private String sn; + private String modifyDateTime; @ApiParam("生产日期") private String dateCode; - @ApiParam("特殊批次") + @ApiParam("批次") private String lotNo; + @ApiParam("特殊批次") private String fixLotNo; + + @ApiParam("生产批次") private String leftCode; + + @ApiParam("物料代码") private String partNo; + + @ApiParam("物料名称") private String partName; + + @ApiParam("数量") private String qty; + + @ApiParam("源仓库代码") private String srcWhNo; + + @ApiParam("源存储区代码") private String srcZoneNo; + + @ApiParam("源库位代码") private String srcLocateNo; } From d648228b1850549b355363c79b8a8488da8caa4e Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Wed, 16 Dec 2020 16:03:59 +0800 Subject: [PATCH 255/329] =?UTF-8?q?13300=2020027-=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92--=E7=82=B9=E5=87=BB=E7=94=9F=E6=95=88?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=93=8D=E5=BA=94--2020-12-16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index ee666a5..24e0a52 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3466,9 +3466,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(controlPlan.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCenterCode(), "workCenterCode", packBean); } -// if (!StringUtils.isEmpty(controlPlan.getWorkCellCode())) { -// DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCellCode(), "workCellCode", packBean); -// } if (!StringUtils.isEmpty(controlPlan.getPartNo())) { DdlPreparedPack.getStringEqualPack(controlPlan.getPartNo(), "partNo", packBean); } From cd5b882e1f47d1059b77f4d802834c3c80659982 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 16 Dec 2020 20:11:16 +0800 Subject: [PATCH 256/329] =?UTF-8?q?dev=20merge=20test=20pom=20=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f611147..e57acaf 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 2fd1b8942537d2e5e62e1db96b47ed507ec5d202 Mon Sep 17 00:00:00 2001 From: shun Date: Thu, 17 Dec 2020 13:25:34 +0800 Subject: [PATCH 257/329] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7WMS?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/AutoPickingModel.java | 35 ++++++++++++++++++++ .../pojo/wms/modelbean/MinAndMaxStockModel.java | 37 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java new file mode 100644 index 0000000..39decb8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +/** + * @Description : 自动生成领料看板model + * @Author : shun.cui + * @CreateDate : 2020/12/17 10:34 + * @Modify : + **/ +@Data +@Api("自动生成领料看板") +public class AutoPickingModel { + @ApiParam("工厂名") + private String organizeCode; + @ApiParam("计划日期") + private String planDate; + @ApiParam("sap单号") + private String erpSrcNo; + @ApiParam("状态") + private String orderStatus; + @ApiParam("父零件号") + private String partNo; + @ApiParam("简称") + private String partNameRdd; + @ApiParam("完成数量") + private Double printQty; + @ApiParam("总数量") + private Double qty; + @ApiParam("操作时间") + private String modifyDateTime; + @ApiParam("操作人") + private String modifyUser; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java new file mode 100644 index 0000000..642c04d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 最低库存/最高库存 预警看板 Model + * @Author : shun.cui + * @CreateDate : 2020/12/17 10:55 + * @Modify : + **/ +@Data +@Api("最低库存/最高库存预警看板") +public class MinAndMaxStockModel { + @ApiParam("工厂名") + private String organizeCode; + @ApiParam("存储区") + private String zoneNo; + @ApiParam("库位") + private String locateNo; + @ApiParam("零件号") + private String partNo; + @ApiParam("简称") + private String partNameAdd; + @ApiParam("数量") + private Double qty; + @ApiParam("最低库存") + private Double min; + @ApiParam("最高库存") + private Double max; + @ApiParam("件号") + private String partTypeDesc; + @ApiParam("包装规格") + private String snp; + +} From 7e8970f3e2f5bf81324a8bddc8e1b72fde342868 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 17 Dec 2020 14:42:03 +0800 Subject: [PATCH 258/329] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) 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 b9836f9..574d56d 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 @@ -18,7 +18,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PART_CHECK_DATA_TYPE { ALL_DATA(1, "所有数据"), - LAST_DATA(2, "最后一条数据"); + LAST_DATA(2, "最后一条数据"), + ALL_DATA_AND_LAST_DATA(3, "所有数据且最后一条数据必须合格"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 55cf9e7..09972c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -31,6 +31,9 @@ public class DataReviewModel { @ApiParam("对象代码") private String objectCode; + @ApiParam("末检是否合格") + private String lastDataResult; + @ApiParam("是否合格标识") private Integer reviewFlag; @@ -38,7 +41,7 @@ public class DataReviewModel { private String reviewResult; @ApiParam("显示标识") - private String showFlag; + private Integer showFlag; @ApiParam("颜色") private String color; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java index ae6e97a..5e1307d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java @@ -24,4 +24,7 @@ public class ProductDataCacheModel { @ApiParam("创建时间") private String createDatetime; + @ApiParam("是否必须是合格") + private Boolean isNecessary = false; + } From 1595f68723ab6a6ee53d67b34a047b6435fa5dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 17 Dec 2020 17:51:56 +0800 Subject: [PATCH 259/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#3036?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsUserPrinterInfo.java | 38 ++++++++++++++++++++++ .../repository/WmsUserPrinterInfoRepository.java | 14 ++++++++ 2 files changed, 52 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java new file mode 100644 index 0000000..2a8b64a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.wms.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.*; + +/** + * @Description 用户打印机绑定信息 + * @Reference + * @Author dragon + * @CreateDate 2020/12/17 15:38 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_USER_PRINTER_INFO") +@Api("用户打印机绑定信息") +public class WmsUserPrinterInfo extends BaseBean{ + + @Column(name="PRINTER_NO") + @ApiParam("打印机编号") + private String printerNo; + + @Column(name="USER_NO") + @ApiParam("用户编码") + private String userNo; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java new file mode 100644 index 0000000..c671f1b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsUserPrinterInfo; + +/** + * @Description 用户打印机绑定信息DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/12/17 15:42 + * @Modify + */ +public interface WmsUserPrinterInfoRepository extends BaseRepository { +} From cc99971690f7d0aaa0c01a14f398696f0eae65fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 17 Dec 2020 18:13:26 +0800 Subject: [PATCH 260/329] =?UTF-8?q?=E3=80=9013140=2020027-=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=E5=A2=9E=E5=8A=A0=E5=8C=85=E8=A3=85=E7=AE=B1?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=8E=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF=E7=95=8C?= =?UTF-8?q?=E9=9D=A2--20201221=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 11 +++++++++++ 3 files changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 629f60b..158ed97 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -199,6 +199,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("包装编号集合") private List packageNoList = new ArrayList<>(); + @Transient + @ApiParam(value = "生产线名称") + private String workCenterName; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index fafc076..a9c9324 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -73,6 +73,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("批次") private String lotNo; + @Transient + @ApiParam("产品条码") + private String productSn; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 24e0a52..e822848 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3687,4 +3687,15 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesPackage(MesPackage mesPackage) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesPackage.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean); + DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean); + return packBean; + } + } From 97e919552ad6b6c4920a9796009000d9d3f0c2fe Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 18 Dec 2020 09:59:27 +0800 Subject: [PATCH 261/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E6=8F=8F=E8=BF=B0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.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/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java index d03759d..15c072a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -31,7 +31,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_PACKAGE") -@Api("料箱表") +@Api("包装条码接口表") public class IfPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 9099416791684702129L; From ade905350227a9972a2e18bd91722f85b55e6bae Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 10:25:21 +0800 Subject: [PATCH 262/329] =?UTF-8?q?13325=2020027--=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8--=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5GTB2A268000P1=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BAGTB2A268000P1A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=BC=96=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE-2020-12-?= =?UTF-8?q?18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 24e0a52..9ce9917 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2084,7 +2084,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); From c067c671a9348986707c2e9a859ec49eb4883632 Mon Sep 17 00:00:00 2001 From: shun Date: Fri, 18 Dec 2020 10:43:08 +0800 Subject: [PATCH 263/329] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java index 39decb8..cfac2ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java @@ -19,7 +19,7 @@ public class AutoPickingModel { @ApiParam("sap单号") private String erpSrcNo; @ApiParam("状态") - private String orderStatus; + private int orderStatus; @ApiParam("父零件号") private String partNo; @ApiParam("简称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java index 642c04d..5c4866a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java @@ -32,6 +32,6 @@ public class MinAndMaxStockModel { @ApiParam("件号") private String partTypeDesc; @ApiParam("包装规格") - private String snp; + private Double snp; } From 23bbde205707f357400ff3eb7d15c61127c6f95d Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 14:13:03 +0800 Subject: [PATCH 264/329] =?UTF-8?q?13315=2020027-=E8=BF=94=E4=BF=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4=E7=A0=81-202012-2?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index ef071db..0847a20 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -115,6 +115,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("维修状态名称") private String repairStatusName; + @Transient + @ApiParam("产品二维码") + private String productSn; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } From 3c6b869821d31881d7a973614aa041dc2f924bcf Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 14:19:37 +0800 Subject: [PATCH 265/329] =?UTF-8?q?13325=2020027--=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8--=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5GTB2A268000P1=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BAGTB2A268000P1A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=BC=96=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE-2020-12-?= =?UTF-8?q?18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 09faa0d..efd9773 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2081,7 +2081,7 @@ public class MesHqlPack { public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode); if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean); @@ -2093,7 +2093,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); } if (mesProduceSn.getSnStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); @@ -2102,7 +2102,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean); } if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); From 419fe3a62e8ab800576f04f6e871d33cbd7fb417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 18 Dec 2020 15:04:02 +0800 Subject: [PATCH 266/329] =?UTF-8?q?=E3=80=9013330=2020027--BI=E8=AF=A6?= =?UTF-8?q?=E6=83=85----=E4=BA=A7=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85?= =?UTF-8?q?=E5=86=B5--=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E7=8E=87?= =?UTF-8?q?=E6=B5=AE=E7=AA=97=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96--2020-12-18=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java index 17d1089..73a1815 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -20,4 +21,8 @@ public class ProductBiSeriesModel { private String type; @ApiParam("显示的数据") private List data; + @ApiParam("实际数量集合") + private List snQtyList = new ArrayList<>(); + @ApiParam("计划数量集合") + private List planQtyList = new ArrayList<>(); } From ded63e25dbc59a9ba59fad1f77a8d313ec5af24c Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Dec 2020 21:07:54 +0800 Subject: [PATCH 267/329] =?UTF-8?q?=E5=9D=A4=E6=B3=B0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= 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 | 3 ++- 1 file changed, 2 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 8ab7b56..1ccf8d2 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 @@ -278,10 +278,11 @@ public class WmsPOMasterDetails extends BaseBean { this.rcQty = rcQty; } - public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode){ + public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode, String createDatetime){ this.orderNo = orderNo; this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; + this.createDatetime = createDatetime; } public WmsPOMasterDetails( From 6c2569ee924c59c89a06494f4f378cf2b2743050 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 19 Dec 2020 07:02:45 +0800 Subject: [PATCH 268/329] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 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 4173305..7023c0c 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 @@ -8,8 +8,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -19,6 +17,8 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; @@ -923,4 +923,14 @@ public class WmsStockSn extends BaseBean { this.snStatus = snStatus; this.lotNo = lotNo; } + + public WmsStockSn(String organizeCode, String sn, String partNo, String locateNo, String whNo, String zoneNo, String vendorNo) { + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.locateNo = locateNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.vendorNo = vendorNo; + } } From c016cb734b4bf601613deab66e56a4f7461ca111 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Mon, 21 Dec 2020 14:30:28 +0800 Subject: [PATCH 269/329] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index efd9773..1c1a2b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -156,10 +156,10 @@ public class MesHqlPack { public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); @@ -177,10 +177,10 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); @@ -208,7 +208,7 @@ public class MesHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); DdlPreparedPack.getOrderDefault(mesWorkOrder); return packBean; } From b58904bd949f70cd327bdbe411b032ee9f0ca809 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 21 Dec 2020 17:47:03 +0800 Subject: [PATCH 270/329] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.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/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 574d56d..b2c21d4 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 @@ -355,7 +355,7 @@ public class MesPcnEnumUtil { PCN_LOGOUT(190, "PCN_LOGOUT", ""), UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), - PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), + PCN_SYS_ALL_LANGUAGE_URL(220, "PCN_SYS_ALL_LANGUAGE_URL", "PCN_SYS_ALL_LANGUAGE_URL"), PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"), SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes"); From 4ec01b61f7982cc71a20c1a13882b6d6913a5c51 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Mon, 21 Dec 2020 18:50:05 +0800 Subject: [PATCH 271/329] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8+=E5=85=A8=E5=B7=A5=E5=BA=8F=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/report/DefectRecordModel.java | 44 +++++++++++++ .../pojo/mes/model/report/PackageTravelModel.java | 76 ++++++++++++++++++++++ .../model/report/ProcessScrapRateQueryModel.java | 42 ++++++++++++ .../pojo/mes/model/report/ProductSnModel.java | 60 +++++++++++++++++ .../mes/model/report/ProductSnTravelModel.java | 62 ++++++++++++++++++ 5 files changed, 284 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java new file mode 100644 index 0000000..62fef81 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.io.Serializable; + +/** + * 产品履历报表-缺陷信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +public class DefectRecordModel implements Serializable { + + private static final long serialVersionUID = 4994719388513997046L; + + + @ApiParam("不良处理类型") + private Integer defectActionType; + + @ApiParam("不良处理类型Name") + private String defectActionTypeName; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("缺陷位置") + private String defectLocationName; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java new file mode 100644 index 0000000..926172c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-料箱信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 17:16 + **/ +@Data +public class PackageTravelModel implements Serializable { + + private static final long serialVersionUID = -7031472442162953544L; + + + + + @ApiParam("过程条码") + + private String serialNumber; + + @ApiParam("料箱编号") + private String ctNo; + + @ApiParam("包装号") + private String packageNo; + + @ApiParam("料箱类型") + private String cnCode; + + @ApiParam("料箱状态") + private String useStatus; + + @ApiParam("料箱状态Name") + private String useStatusName; + + @ApiParam("物料码") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工序信息") + private String processCode; + + @ApiParam("执行动作") + private Integer opType; + + @ApiParam("执行动作Name") + private String opTypeName; + + + @ApiParam("执行时间") + private String createDatetime; + + public PackageTravelModel(String serialNumber, String ctNo, String packageNo, String cnCode, String useStatus, String partNo, String partNameRdd, String workCenterCode, String processCode, Integer opType, String createDatetime) { + this.serialNumber = serialNumber; + this.ctNo = ctNo; + this.packageNo = packageNo; + this.cnCode = cnCode; + this.useStatus = useStatus; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.processCode = processCode; + this.opType = opType; + this.createDatetime = createDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java new file mode 100644 index 0000000..00746fd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * 全工序报废率-查询条件-model + * @author yumingxing + * @version 1.0 + * @date 2020/12/21 10:10 + **/ +@Data +public class ProcessScrapRateQueryModel { + + @ApiParam("工序") + private List processCodeList; + + @ApiParam("项目号") + private List prodCfgTypeCodeList; + + /** + * 零件号取物料号 + */ + @ApiParam("零件号") + private List partNoList; + + @ApiParam("开始日期") + private String modifyStartDate; + + @ApiParam("结束日期") + private String modifyEndDate; + + @ApiParam("账号") + private String userLoginName; + + @ApiParam("姓名") + private String userNameRdd; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java new file mode 100644 index 0000000..2a6ed2b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-产品信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +public class ProductSnModel implements Serializable { + + private static final long serialVersionUID = 5217363746963291483L; + + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("条码状态") + private Integer snStatus; + + @ApiParam("条码状态Name") + private String snStatusName; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("质量状态Name") + private String qcStatusName; + + @ApiParam("物料码") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("当前工序") + private String processCode; + + @ApiParam("条码类型") + private String snType; + + @ApiParam("条码类型Name") + private String snTypeName; + + + @ApiParam(value = "执行时间") + public String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java new file mode 100644 index 0000000..2109368 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-过程信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +public class ProductSnTravelModel implements Serializable { + + private static final long serialVersionUID = 6720300188491659067L; + + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("条码状态") + private Integer snStatus; + + @ApiParam("条码状态Name") + private String snStatusName; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("质量状态Name") + private String qcStatusName; + + @ApiParam("物料码") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("当前工序") + private String processCode; + + @ApiParam("当前工序") + private String nextProcessCode; + + @ApiParam("条码类型") + private Integer snType; + + @ApiParam("条码类型Name") + private String snTypeName; + + @ApiParam(value = "执行时间") + public String modifyDatetime; + +} From 268c04ddf3924593cd1b95e9b0797c8276ddda1b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Dec 2020 19:38:08 +0800 Subject: [PATCH 272/329] Fix bug#13229 --- .../i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java index e4212d3..143d55d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java @@ -49,4 +49,19 @@ public class WmsCSOrderDetailsModel implements Serializable { @ApiParam("目标库位") public String destLocateNo; + + @ApiParam("应盘人") + public String detailsCreateUser; + + @ApiParam("应盘时间") + public String detailsCreateDatetime; + + @ApiParam("实盘人") + public String factCreateUser; + + @ApiParam("实盘时间") + public String factCreateDatetime; + + + } From 05dca352dd6ccc472161a614f2b962ba9f41de39 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Dec 2020 13:14:21 +0800 Subject: [PATCH 273/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=B1=A5=E5=8E=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java index 704035a..1c6e43c 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java @@ -53,4 +53,15 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") private String remark; + + public SwebPurchaseChangeLog() { + + } + + public SwebPurchaseChangeLog(Integer itemStatus, String remark, String modifyDatetime, String modifyUser) { + this.itemStatus = itemStatus; + this.remark = remark; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } } From 6e5ea4462f461c9ea9c7f6c6f59235994b7f4c6e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Dec 2020 14:34:29 +0800 Subject: [PATCH 274/329] =?UTF-8?q?=E5=90=88=E5=B9=B6master=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 3751cf9..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a6c1bea..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0a2f9d4..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 2bf0e5c..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 557548a..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 34a7337..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 670eb15..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ce2dc01..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index b8c9643..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1d29933..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 284225c..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 7ff16c9..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 353a02b..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b125cee..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index c9d54a9..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 39f1e2f..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index df01041..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index a18cef1..f611147 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 72d9f64a685e35849ab29cae114640137de64b27 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Dec 2020 14:43:43 +0800 Subject: [PATCH 275/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From baed7db4ed649f4aac284fd54b2f4bcafebd1153 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Dec 2020 15:00:10 +0800 Subject: [PATCH 276/329] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index e57acaf..f611147 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 13ca332c4bb34333acd691273969823cd2e86039 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Tue, 22 Dec 2020 18:11:12 +0800 Subject: [PATCH 277/329] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8+=E5=85=A8=E5=B7=A5=E5=BA=8F=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/report/ProcessModel.java | 25 ++++++++++++++++ .../pojo/mes/model/report/ProcessScrapRate.java | 35 ++++++++++++++++++++++ .../model/report/ProcessScrapRateQueryModel.java | 3 +- .../pojo/mes/model/report/ProductSnModel.java | 2 +- .../pojo/mes/model/report/UserQueryModel.java | 22 ++++++++++++++ 5 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java new file mode 100644 index 0000000..d24fad0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 工序代码+工序名称 实体类 + * @author yumingxing + * @version 1.0 + * @date 2020/12/22 16:56 + **/ +@Data +public class ProcessModel implements Serializable { + + + private static final long serialVersionUID = -6653836427174801385L; + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("工序名称") + private String processName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java new file mode 100644 index 0000000..e405321 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 全工序报废率-查询条件-model + * @author yumingxing + * @version 1.0 + * @date 2020/12/21 10:10 + **/ +@Data +@NoArgsConstructor +public class ProcessScrapRate { + + @ApiParam("工序") + private String processCode; + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("报废率") + private String scrapRate; + + + public ProcessScrapRate(String processCode, String prodCfgTypeCode, String workCellCode) { + this.processCode = processCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.workCellCode = workCellCode; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java index 00746fd..4a21371 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.mes.model.report; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -37,6 +36,6 @@ public class ProcessScrapRateQueryModel { private String userLoginName; @ApiParam("姓名") - private String userNameRdd; + private String userName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index 2a6ed2b..b722e09 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -48,7 +48,7 @@ public class ProductSnModel implements Serializable { private String processCode; @ApiParam("条码类型") - private String snType; + private Integer snType; @ApiParam("条码类型Name") private String snTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java new file mode 100644 index 0000000..be54cc9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author yumingxing + * @version 1.0 + * @date 2020/12/22 10:51 + **/ +@Data +public class UserQueryModel implements Serializable { + + @ApiParam("账号") + private String userLoginName; + @ApiParam("姓名") + private String userName; + + +} From 6b443a7d04a067c7234bc84a8a9dc8ed9d4df406 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Tue, 22 Dec 2020 18:37:42 +0800 Subject: [PATCH 278/329] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8+=E5=85=A8=E5=B7=A5=E5=BA=8F=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java | 5 ++--- .../cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java | 4 +++- .../i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java | 2 ++ .../cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java | 3 +++ 8 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java index 62fef81..c02fbb2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java @@ -1,11 +1,9 @@ package cn.estsh.i3plus.pojo.mes.model.report; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.io.Serializable; /** @@ -15,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/18 15:16 **/ @Data +@ApiModel("产品履历报表-缺陷信息") public class DefectRecordModel implements Serializable { private static final long serialVersionUID = 4994719388513997046L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java index 926172c..14e0e68 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/18 17:16 **/ @Data +@ApiModel("产品履历报表-料箱信息") public class PackageTravelModel implements Serializable { private static final long serialVersionUID = -7031472442162953544L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java index d24fad0..8a0d44b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/22 16:56 **/ @Data +@ApiModel("工序代码+工序名称") public class ProcessModel implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java index e405321..c9afc65 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java @@ -1,17 +1,19 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.NoArgsConstructor; /** - * 全工序报废率-查询条件-model + * 全工序报废率-查询结果-model * @author yumingxing * @version 1.0 * @date 2020/12/21 10:10 **/ @Data @NoArgsConstructor +@ApiModel("全工序报废率-查询结果") public class ProcessScrapRate { @ApiParam("工序") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java index 4a21371..c584d30 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.util.List; * @date 2020/12/21 10:10 **/ @Data +@ApiModel("全工序报废率-查询条件") public class ProcessScrapRateQueryModel { @ApiParam("工序") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index b722e09..a58c651 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/18 15:16 **/ @Data +@ApiModel("产品履历报表-产品信息") public class ProductSnModel implements Serializable { private static final long serialVersionUID = 5217363746963291483L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java index 2109368..41b06c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import java.io.Serializable; * @date 2020/12/18 15:16 **/ @Data +@ApiModel("产品履历报表-过程信息") public class ProductSnTravelModel implements Serializable { private static final long serialVersionUID = 6720300188491659067L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java index be54cc9..6ab47bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java @@ -1,16 +1,19 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; /** + * 用户查询-账号+姓名 * @author yumingxing * @version 1.0 * @date 2020/12/22 10:51 **/ @Data +@ApiModel("用户查询-账号+姓名") public class UserQueryModel implements Serializable { @ApiParam("账号") From 7fcdae795cd2d36766e4fcb53cf303cfa14a7fc0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 15:57:36 +0800 Subject: [PATCH 279/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 10c0680..aa83a19 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; @@ -214,6 +214,29 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster() { } + + public WmsMoveMaster(String organizeCode, String partNo, String partNameRdd, String transTypeCode, + String transTypeName, String unit, String destZoneNo, Double transQty, Double handledQty, Double rejectQty, + Integer busiTypeCode, String createDatetime, String createUser, String modifyUser, + String modifyDatetime, String refSrc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.unit = unit; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.handledQty = handledQty; + this.rejectQty = rejectQty; + this.busiTypeCode = busiTypeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.refSrc = refSrc; + } + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark, String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId, From f63baa9c1aa6f891a60de9b3d44f34307abf2e14 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Dec 2020 17:21:56 +0800 Subject: [PATCH 280/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=20=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E5=A2=9E=E5=8A=A0=20=E6=A8=A1=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 969ad3f..5e86d59 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -89,8 +89,9 @@ public class AndonEnumUtil { QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"), PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"), ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"), - OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"), + OTHER_ALARM_CALL("OTHER_ALARM_CALL", "工装呼叫弹框界面"), FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"), + MODULE_ALARM_CALL("MODULE_ALARM_CALL", "模具呼叫弹框界面"), ALARM_SIGN("ALARM_SIGN", "响应弹框界面"), ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"), ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面"); @@ -1218,7 +1219,8 @@ public class AndonEnumUtil { PART("PART_ALARM", 110060104, "物料", "#24BDBA"), PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"), CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"), - FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"); + FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"), + MOULD("MOULD_ALARM", 160060111, "模具", "#0A8BEE"); private String value; private Integer code; From 4e0cab2f6aaeaf3479fa94e9dd657ec831fedf17 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 19:27:43 +0800 Subject: [PATCH 281/329] =?UTF-8?q?Fix=20bug#13411=20ASN=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=90=8E=E6=9C=AA=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsGcdcContainerModel.java | 169 +++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java new file mode 100644 index 0000000..5a4bd32 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -0,0 +1,169 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : GCDC集装箱model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-11-24 18:17 + * @Modify: + **/ +@Data +@Api("GCDC集装箱model") +public class WmsGcdcContainerModel extends BaseBean { + + @ApiParam("移库单号号") + public String orderNo; + + @ApiParam("库存移动单号") + public String moveNo; + + @ApiParam("条码") + public String sn; + + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + @ApiParam(value = "客户编号") + private String custNo; + + @ApiParam(value = "单据状态") + public Integer orderStatus; + + @ApiParam(value = "库存移动单状态") + public Integer itemStatus; + + @ApiParam(value = "包装编号") + private String packageNo; + + @ApiParam("集装箱号") + private String containerNo; + + @ApiParam("产地") + private String productPlace; + + @ApiParam("托盘重量") + private Double packageWeight; + + @ApiParam(value = "客户名称") + public String custNameRdd; + + @ApiParam(value = "业务类型") + public Integer busiType; + + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @ApiParam(value = "物料号") + public String partNo; + + @ApiParam(value = "物料号") + public String partNameRdd; + + @ApiParam(value = "客户地址") + private String custAddr; + + @ApiParam(value = "客户联系人") + private String custOwner; + + @ApiParam(value = "客户电话号码") + private String custTel; + + @ApiParam(value = "是否集装箱号") + private Integer isContainer; + + @ApiParam("移库单号集合") + private List orderNoList; + + @ApiParam("库存移动单号集合") + private List moveNoList; + + @ApiParam("库存移动单条码集合") + private List moveSnList; + + @ApiParam("库存条码集合") + private List stockSnList; + + @ApiParam(value = "打印队列物料库存集合") + private List wmsPartStockModels; + + @ApiParam(value = "仓库代码") + private String whNo; + + @ApiParam(value = "存储区编号") + private String zoneNo; + + @ApiParam(value = "库位代码") + private String locateNo; + + @ApiParam(value = "客户发往地名称") + private String flagName; + + @ApiParam(value = "客户发往地代码") + private String flagNo; + + @ApiParam(value = "是否绑定发运") + private Integer isBindingShip = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + public WmsGcdcContainerModel() { + } + + public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo, + Integer orderStatus, String createDatetime, String createUser) { + this.id = id; + this.orderNo = orderNo; + this.moveNo = moveNo; + this.erpSrcNo = erpSrcNo; + this.custNo = custNo; + this.orderStatus = orderStatus; + this.createDatetime = createDatetime; + this.createUser = createUser; + } + + public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo, + Integer itemStatus, String createDatetime, String createUser, Integer busiType) { + this.id = id; + this.orderNo = orderNo; + this.moveNo = moveNo; + this.erpSrcNo = erpSrcNo; + this.custNo = custNo; + this.itemStatus = itemStatus; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.busiType = busiType; + } + + public WmsGcdcContainerModel(Long id, String orderNo, String packageNo, Double packageWeight, String custNo, String partNo, String flagNo) { + this.id = id; + this.orderNo = orderNo; + this.packageNo = packageNo; + this.packageWeight = packageWeight; + this.custNo = custNo; + this.partNo = partNo; + this.flagNo = flagNo; + } + + public WmsGcdcContainerModel(Long id, String organizeCode, Double packageWeight, String packageNo, String zoneNo, + String locateNo, String whNo, String partNo, String partNameRdd, String custNo, String flagNo) { + this.id = id; + this.organizeCode = organizeCode; + this.packageWeight = packageWeight; + this.packageNo = packageNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.whNo = whNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.custNo = custNo; + this.flagNo = flagNo; + } +} From 87dcbd64f82d4d527d57509258103abf861bb7a9 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 19:28:23 +0800 Subject: [PATCH 282/329] =?UTF-8?q?Fix=20bug#13411=20ASN=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=90=8E=E6=9C=AA=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java index 5a4bd32..3b23ea7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -93,9 +93,6 @@ public class WmsGcdcContainerModel extends BaseBean { @ApiParam("库存条码集合") private List stockSnList; - @ApiParam(value = "打印队列物料库存集合") - private List wmsPartStockModels; - @ApiParam(value = "仓库代码") private String whNo; From 1bebe59cc2e08b1e39417fc73cf38a9aec504094 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Thu, 24 Dec 2020 09:08:42 +0800 Subject: [PATCH 283/329] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8+=E5=85=A8=E5=B7=A5=E5=BA=8F=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/report/ProcessScrapRate.java | 4 +++- .../pojo/mes/model/report/ScrapOfPlatoModel.java | 26 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java index c9afc65..9589f43 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; + /** * 全工序报废率-查询结果-model * @author yumingxing @@ -26,7 +28,7 @@ public class ProcessScrapRate { private String workCellCode; @ApiParam("报废率") - private String scrapRate; + private BigDecimal scrapRate; public ProcessScrapRate(String processCode, String prodCfgTypeCode, String workCellCode) { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java new file mode 100644 index 0000000..de4cdfe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * 报废占比柏拉图Model + * @author yumingxing + * @version 1.0 + * @date 2020/12/23 15:09 + **/ +@Data +public class ScrapOfPlatoModel { + + @ApiParam("缺陷数") + private String numberOfDefects; + @ApiParam("缺陷类型") + private String defectType; + @ApiParam("缺陷类型名称") + private String defectTypeName; + @ApiParam("项目") + private String prodCfgTypeCode; + @ApiParam("零件号") + private String partNo; + +} From 2ccee2523aab5dc22dda150ee83c1cb5718a063c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 24 Dec 2020 14:40:14 +0800 Subject: [PATCH 284/329] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 28 ++++++++++++ .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ++++++++++++++++++++++ .../MesWorkCellJumpRecordRepository.java | 16 +++++++ 3 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java 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 b2c21d4..0c83988 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 @@ -6068,4 +6068,32 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * MesWorkCellJumpRecord 跳过类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_JUMP_TYPE { + + SERIAL_SN(10, "过程条码"), + PRODUCT_SN(20, "产品条码"), + PACK_SN(30, "包装条码"), + OTHER(40, "其他"); + + private int value; + private String description; + + MES_WORK_CELL_JUMP_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java new file mode 100644 index 0000000..de9d7e6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java @@ -0,0 +1,52 @@ +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 : wangjie + * @CreateDate : 2020-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WORK_CELL_JUMP_RECORD") +@Api("mes工位操作跳过记录表") +public class MesWorkCellJumpRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1017369816822438021L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "JUMP_TYPE") + @ApiParam("跳过类型 10=过程条码") + private Integer jumpType; + + @Column(name = "JUMP_VALUE") + @ApiParam("跳过值") + private String jumpValue; + + @Column(name = "JUMP_DESC") + @ApiParam("跳过描述") + private String jumpDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java new file mode 100644 index 0000000..6a3f7a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellJumpRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellJumpRecordRepository extends BaseRepository { +} From f21076733205388e0a8ed8784ca05818936eb281 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 24 Dec 2020 15:20:05 +0800 Subject: [PATCH 285/329] =?UTF-8?q?BUG=20#13415=2019058-=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=EF=BC=8C=E7=94=9F=E6=88=90=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=9C=80=E8=A6=81=E6=8A=8A=E5=8E=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7=E4=BD=9C=E4=B8=BA=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=9C=A8=E7=95=8C=E9=9D=A2=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index e0654fb..0f4a349 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -6,16 +6,11 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel; 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.Transient; +import javax.persistence.*; import java.util.List; /** @@ -137,6 +132,11 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("调拨单录入字段") private String defectiveAllocation; + //关联单号 + @Column(name="ORDER_NO") + @ApiParam("关联单号") + private String orderNo; + // @Transient // @ApiParam("打印模板列表") // private String defectiveAllocation; From 7e400a1a6878d0a95b1576b4ddf6ff1ab296d43d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 24 Dec 2020 19:24:21 +0800 Subject: [PATCH 286/329] Fix bug#13399 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 21 ++++++++-- .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 7 +++- 3 files changed, 68 insertions(+), 5 deletions(-) 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 90446fd..d487780 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 @@ -9494,6 +9494,51 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 报废类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRAP_TYPE { + ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"), + AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废"); + + private int value; + private String code; + private String description; + + SCRAP_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 077a83c..295096f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -8,14 +8,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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 lombok.ToString; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -269,6 +273,17 @@ public class WmsDocMovementMaster extends BaseBean { isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue") private String fourthRemake; + + /** + * + */ + @Column(name = "SCRAP_TYPE") + @ApiParam("报废类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description") + public Integer scrapType; + + + @Column(name = "IS_REMOVE_ORDER") @ApiParam(value = "是否撤销单据") private Integer isRemoveOrder = CommonEnumUtil.FALSE; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index ca32ae5..c16b143 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** @@ -96,6 +96,9 @@ public class WmsPartExtend extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotControl; + /** + * 单位：天 + */ @Column(name = "RANGE_LOT") @ApiParam(value = "批次容差") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) From 04f1da7f3f5a04087f13f255e8687c1072e9a3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Dec 2020 10:37:05 +0800 Subject: [PATCH 287/329] =?UTF-8?q?=E3=80=903057=20=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=B1=A5=E5=8E=86=E6=8A=A5=E8=A1=A8=20-=20=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=BC=80=E5=8F=91=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/mes/bean/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 158ed97..ff0bbdf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -203,6 +203,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam(value = "生产线名称") private String workCenterName; + @Transient + @ApiParam("工序名称") + private String processName; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1c1a2b0..0dacf19 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3692,7 +3692,8 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getCtNo(), "ctNo", packBean); DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean); DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean); return packBean; From b20fc8e55236145a682b5a2cb2dfecd86b493b14 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 25 Dec 2020 11:48:29 +0800 Subject: [PATCH 288/329] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ---------------------- .../MesWorkCellJumpRecordRepository.java | 16 ------- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java 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 0c83988..c03278f 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 @@ -4231,6 +4231,7 @@ public class MesPcnEnumUtil { public enum PRODUCE_ERROR_RECORD { JUMP_PROCESS(10, "跳过工序"), JUMP_STEP(20, "跳过工步"), + JUMP_STEP_IN_STATE(25, "跳过状态点中的工步"), JUMP_STATE(30, "跳过状态点"), ABNORMAL_DEDUCTION(40, "扣减异常"), REDO_STATION(50, "工位重做"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java deleted file mode 100644 index de9d7e6..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java +++ /dev/null @@ -1,52 +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 : wangjie - * @CreateDate : 2020-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_WORK_CELL_JUMP_RECORD") -@Api("mes工位操作跳过记录表") -public class MesWorkCellJumpRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1017369816822438021L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "JUMP_TYPE") - @ApiParam("跳过类型 10=过程条码") - private Integer jumpType; - - @Column(name = "JUMP_VALUE") - @ApiParam("跳过值") - private String jumpValue; - - @Column(name = "JUMP_DESC") - @ApiParam("跳过描述") - private String jumpDesc; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java deleted file mode 100644 index 6a3f7a7..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellJumpRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellJumpRecordRepository extends BaseRepository { -} From 819a4312ae274d2519a144c9748aa01ca6971c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 25 Dec 2020 13:37:31 +0800 Subject: [PATCH 289/329] =?UTF-8?q?=E5=96=9C=E5=BE=B7WMS=EF=BC=9ABUG#13293?= =?UTF-8?q?=EF=BC=8C13295=EF=BC=8C13294?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 18 ++++++++++++++++++ 1 file changed, 18 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 7d27d82..5ba84cf 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 @@ -740,4 +740,22 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.destLocateName = locateName; } + public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo,Integer moveType, Integer busiType, + String item, String partNo, String partNameRdd,String unit, Double qty, + Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) { + this.organizeCode = organizeCode; + this.workOrderCode = workOrderCode; + this.orderNo = orderNo; + this.moveType = moveType; + this.busiType = busiType; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.qty = qty; + this.isSn = isSn; + this.orderMasterStatus = orderMasterStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + } } From 60ef8f3b96fb16e173bfe33b8a9a4bf55d556a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 25 Dec 2020 13:50:37 +0800 Subject: [PATCH 290/329] =?UTF-8?q?feat(sms):=E5=B9=B3=E5=8F=B0=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 165 ++++++++++++++++++++- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 12 ++ .../i3plus/pojo/model/common/ImppSmsContent.java | 38 +++++ .../pojo/platform/bean/SysSmsSendRecord.java | 128 ++++++++++++++++ .../i3plus/pojo/platform/bean/SysSmsSign.java | 54 +++++++ .../i3plus/pojo/platform/bean/SysSmsTemplate.java | 101 +++++++++++++ .../repository/SysSmsSendRecordRepository.java | 14 ++ .../platform/repository/SysSmsSignRepository.java | 14 ++ .../repository/SysSmsTemplateRepository.java | 14 ++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 157 +++++++++++++++----- 10 files changed, 661 insertions(+), 36 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index c18a856..017b3c5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1081,7 +1081,8 @@ public class ImppEnumUtil { BASIS(5, "基础"), CONFIG(6, "系统配置"), LOG(7, "日志配置"), - WORK_WECHAT(8, "企业微信配置"); + WORK_WECHAT(8, "企业微信配置"), + SMS(9, "短信配置"); private int value; private String description; @@ -1471,4 +1472,166 @@ public class ImppEnumUtil { return null; } } + + /** + * 短信供应商 + */ + public enum SMS_SUPPLIER { + + ALI_CLOUD(1, "阿里云"); + + private int value; + private String description; + + SMS_SUPPLIER() { + } + + SMS_SUPPLIER(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static SMS_SUPPLIER valueOf(int val) { + SMS_SUPPLIER tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + } + + /** + * 短信模板状态 + */ + public enum SMS_TEMPLATE_STATUS { + VER_CODE(10, "审核中"), + NOTICE_SMS(20, "审核通过"), + PROMOTE_SMS(30, "审核失败"); + + private int value; + private String description; + + SMS_TEMPLATE_STATUS() { + } + + SMS_TEMPLATE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 短信模板类型 + */ + public enum SMS_TEMPLATE_TYPE { + VER_CODE(10, "验证码"), + NOTICE_SMS(20, "短信通知"), + PROMOTE_SMS(30, "推广短信"), + INTL_SMS(40, "国际/港澳台消息"); + + private int value; + private String description; + + SMS_TEMPLATE_TYPE() { + } + + SMS_TEMPLATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 短信发送状态 + */ + public enum SMS_SEND_STATUS { + WAIT_RECEIPT(10, "等待回执"), + FAIL(20, "发送失败"), + SUCCESS(30, "发送成功"); + + private int value; + private String description; + + SMS_SEND_STATUS() { + } + + SMS_SEND_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 8daabbc..eaafc21 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -294,6 +294,18 @@ public class DdlPreparedPack { } /** + * 不建议使用该方法，仅在特殊情况下使用。 + * 如sqlserver库中不允许对长数据字段进行=判断，可使用like替换 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikeEqualPack(String val, String columnName, DdlPackBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val); + } + } + + /** * 封装String对象成不等于语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java new file mode 100644 index 0000000..eb94499 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Map; + +/** + * @Description : Impp短信内容 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-24 20:31 + * @Modify: + **/ +@Data +@ApiModel("Impp短信内容") +public class ImppSmsContent implements Serializable { + + private static final long serialVersionUID = 3329812596753451793L; + + @ApiModelProperty(value = "软件模块") + private Integer softType; + + @ApiModelProperty(value = "接收手机号") + private String receivePhoneNumber; + + @ApiModelProperty(value = "短信签名代码") + private String smsSignCode; + + @ApiModelProperty(value = "模板代码") + private String templateCode; + + @ApiModelProperty(value = "短信参数") + private Map paramMap; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java new file mode 100644 index 0000000..64f297f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java @@ -0,0 +1,128 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:13 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_SEND_RECORD") +@ApiModel(value = "短信发送记录", description = "短信发送记录") +public class SysSmsSendRecord extends BaseBean { + + private static final long serialVersionUID = -3745690058553350416L; + + /** + * 发送回执ID + */ + @Column(name = "BIZ_ID") + @ApiModelProperty(value = "回执id") + private String bizId; + + /** + * 软件模块 + */ + @Column(name = "SOFT_TYPE") + @ApiModelProperty(value = "软件模块") + private Integer softType; + + /** + * 接收手机号 + */ + @Column(name = "RECEIVE_PHONE_NUMBER") + @ApiModelProperty(value = "接收手机号") + private String receivePhoneNumber; + + /** + * 模板代码 + */ + @Column(name = "TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String templateCode; + + /** + * 模板名称 + */ + @Column(name = "TEMPLATE_NAME") + @ApiModelProperty(value = "模板名称") + private String templateName; + + /** + * 短信签名代码 + */ + @Column(name = "SMS_SIGN_CODE") + @ApiModelProperty(value = "短信签名代码") + private String smsSignCode; + + /** + * 短信签名 + */ + @Column(name = "SMS_SIGN") + @ApiModelProperty(value = "短信签名") + private String smsSign; + + /** + * 短信内容 + */ + @Column(name = "SMS_CONTENT") + @ApiModelProperty(value = "短信内容") + private String smsContent; + + /** + * 短信内容 + */ + @Column(name = "SMS_Param", length = 1000) + @ApiModelProperty(value = "短信参数") + private String smsParam; + + /** + * 短信发送状态 + */ + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SEND_STATUS.class) + @Column(name = "SMS_SEND_STATUS") + @ApiModelProperty(value = "短信发送状态") + private Integer smsSendStatus; + + /** + * 短信发送时间 + */ + @Column(name = "SEND_DATE_TIME") + @ApiModelProperty(value = "短信发送时间") + private String sendDateTime; + + /** + * 短信接收日期和时间 + */ + @Column(name = "RECEIVE_DATE_TIME") + @ApiModelProperty(value = "短信接收日期和时间") + private String receiveDateTime; + + /** + * 短信发送异常信息 + */ + @Lob + @Column(name = "SEND_ERR_MSG") + @ApiModelProperty(value = "短信发送异常信息") + private String sendErrMsg; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java new file mode 100644 index 0000000..e3a4ef8 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +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; + +/** + * @Description : 短信签名 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_SIGN") +@ApiModel(value = "短信签名", description = "短信签名") +public class SysSmsSign extends BaseBean { + + private static final long serialVersionUID = -8979657974497978428L; + + /** + * 签名 + */ + @Column(name = "SIGN_NAME") + @ApiModelProperty(value = "签名") + private String signName; + + /** + * 签名代码 + */ + @Column(name = "SIGN_CODE") + @ApiModelProperty(value = "签名代码") + private String signCode; + + /** + * 签名描述 + */ + @Column(name = "SIGN_DESC") + @ApiModelProperty(value = "签名描述") + private String signDesc; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java new file mode 100644 index 0000000..c298f3e --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java @@ -0,0 +1,101 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +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.Transient; + +/** + * @Description : 短信模板 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_TEMPLATE") +@ApiModel(value = "短信模板", description = "短信模板") +public class SysSmsTemplate extends BaseBean { + + private static final long serialVersionUID = -3879367761511016412L; + + /** + * 模板名称 + */ + @Column(name = "TEMPLATE_NAME") + @ApiModelProperty(value = "模板名称") + private String templateName; + + /** + * 模板代码 + */ + @Column(name = "TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String templateCode; + + /** + * 模板代码 + */ + @Column(name = "SUPPLIER_TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String supplierTemplateCode; + + /** + * 模板类型 + */ + @Column(name = "TEMPLATE_TYPE") + @ApiModelProperty(value = "模板类型") + private Integer templateType; + + /** + * 供应商类型 + */ + @Column(name = "SUPPLIER_TYPE") + @ApiModelProperty(value = "供应商类型") + private Integer supplierType; + + /** + * 模板状态 + */ + @Column(name = "TEMPLATE_STATUS") + @ApiModelProperty(value = "模板状态") + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class) + private Integer templateStatus; + + /** + * 模板内容 + */ + @Column(name = "TEMPLATE_CONTENT") + @ApiModelProperty(value = "模板内容") + private String templateContent; + + /** + * 模板描述 + */ + @Column(name = "TEMPLATE_DESC") + @ApiModelProperty(value = "模板描述") + private String templateDesc; + + + /** + * 审批备注 + */ + @Transient + @ApiModelProperty(value = "审批备注") + private String reason; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java new file mode 100644 index 0000000..2ea1dd5 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsSendRecord; + +/** + * @Description : 短信发送记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:52 + * @Modify: + **/ +public interface SysSmsSendRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java new file mode 100644 index 0000000..0e1adaf --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsSign; + +/** + * @Description : 短信签名 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:51 + * @Modify: + **/ +public interface SysSmsSignRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java new file mode 100644 index 0000000..94d50ba --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsTemplate; + +/** + * @Description : 短信模板 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:52 + * @Modify: + **/ +public interface SysSmsTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 694c194..b5b3a86 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -584,11 +584,11 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); // DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(), "userEmpNo", result); // DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList, "id", result); @@ -1143,66 +1143,68 @@ public class CoreHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan){ + public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTaskPlan); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(),"id",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(),"name",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(),"groupName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(), "name", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(), "groupName", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig){ + + public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); - DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(),"id",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig){ + public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin){ + public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLogUserLogin); - DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(),"logLoginStatus",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(),"logLoginPlatform",ddlPackBean); - DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(),"logLoginName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(), "logLoginStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(), "logLoginPlatform", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(), "logLoginName", ddlPackBean); DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginHost(), "logLoginHost", ddlPackBean); DdlPreparedPack.timeBuilder(sysLogUserLogin.getLogLoginDateTime(), "logLoginDateTime", ddlPackBean, false, true); return ddlPackBean; } - public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef,List valueList){ + public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef, List valueList) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean); - DdlPreparedPack.getInPackList(valueList,"valueList",ddlPackBean); + DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean); + DdlPreparedPack.getInPackList(valueList, "valueList", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef,List userIdList){ + + public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef, List userIdList) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean); - DdlPreparedPack.getInPackList(userIdList,"userId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean); + DdlPreparedPack.getInPackList(userIdList, "userId", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal){ + public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysRefUserExternal); DdlPreparedPack.getNumEqualPack(sysRefUserExternal.getUserId(), "userId", ddlPackBean); @@ -1213,7 +1215,7 @@ public class CoreHqlPack { } - public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord){ + public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean); @@ -1224,7 +1226,7 @@ public class CoreHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord){ + public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); DdlPreparedPack.getNumNOEqualPack(sysSoftUpdateRecord.getId(), "id", ddlPackBean); @@ -1235,20 +1237,105 @@ public class CoreHqlPack { } - public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){ + public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment); DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){ + public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize); DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装检查短信签名唯一hql + * + * @param sysSmsSign 短信签名信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlCheckSysSmsSignOnly(SysSmsSign sysSmsSign) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign); + + DdlPreparedPack.getNumNOEqualPack(sysSmsSign.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信签名查询hql + * + * @param sysSmsSign 短信签名信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsSign(SysSmsSign sysSmsSign) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign); + + DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignName(), "signName", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装检查短信模板唯一hql + * + * @param sysSmsTemplate 短信模板信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlCheckSysSmsTemplateOnly(SysSmsTemplate sysSmsTemplate) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate); + + DdlPreparedPack.getNumNOEqualPack(sysSmsTemplate.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信模板查询hql + * + * @param sysSmsTemplate 短信模板信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsTemplate(SysSmsTemplate sysSmsTemplate) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate); + + DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信发送记录查询hql + * + * @param sysSmsSendRecord 短信发送记录 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsSendRecord(SysSmsSendRecord sysSmsSendRecord) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSendRecord); + + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getReceivePhoneNumber(), "receivePhoneNumber", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getBizId(), "bizId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSoftType(), "softType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSmsSendStatus(), "smsSendStatus", ddlPackBean); + DdlPreparedPack.timeBuilder(sysSmsSendRecord.getSendDateTime(), "smsSendStatus", ddlPackBean,false,true); return ddlPackBean; } From 61364e21700591e7e51cf7b0bb0fe6b5c392ab43 Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Fri, 25 Dec 2020 17:19:55 +0800 Subject: [PATCH 291/329] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 28 ++++++++++++ .../mes/model/MesProduceSnDisposableModel.java | 52 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 158ed97..75b2b57 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -246,4 +246,32 @@ public class MesPackage extends BaseBean implements Serializable { this.custCode = custCode; this.shiftGroup = shiftGroup; } + + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty,Double packSpecQty, String unit,String lotNo, String fixLotNo,String packSpec,Integer isSealed, Integer printStatus,Integer packLevel,String workOrderNo, String workCenterCode, String workCellCode,String memo, String custCode, String inLocationTime, String ctNo,String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo) { + this.packageNo = packageNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.packSpecQty=packSpecQty; + this.unit = unit; + this.lotNo=lotNo; + this.fixLotNo = fixLotNo; + this.packSpec=packSpec; + this.isSealed=isSealed; + this.printStatus = printStatus; + this.packLevel=packLevel; + this.workOrderNo=workOrderNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.memo=memo; + this.custCode = custCode; + this.inLocationTime = inLocationTime; + this.ctNo = ctNo; + this.sampleType=sampleType; + this.packageLabelTemplate = packageLabelTemplate; + this.qrCode = qrCode; + this.locationCode = locationCode; + this.erpWorkCenterCode = erpWorkCenterCode; + this.fnLocationNo = fnLocationNo; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java new file mode 100644 index 0000000..0b444ce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/22 14:38 下午 + * @Description: 每个月的冻结数、报废数、生产总数返回model + **/ +@Api("每个月的冻结数、报废数、生产总数返回model") +@Data +public class MesProduceSnDisposableModel { + @ApiParam("统计时间") + private String statisticalTime; + + @ApiParam("质量状态/类型") + private Integer qcStatus; + + @ApiParam("统计选项") + private String statisticalOption; + + @ApiParam("冻结数") + private BigDecimal freezeQty; + + @ApiParam("报废数") + private BigDecimal scrapQty; + + @ApiParam("生产总数") + private BigDecimal produceSumQty; + + @ApiParam("占比率") + private BigDecimal ratio; + + public MesProduceSnDisposableModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { + this.statisticalTime = statisticalTime; + this.qcStatus = qcStatus; + this.statisticalOption = statisticalOption; + this.freezeQty = freezeQty; + this.scrapQty = scrapQty; + this.produceSumQty = produceSumQty; + this.ratio = ratio; + } + + public MesProduceSnDisposableModel() { + } +} From 5e43c3213172d7d76631ed3912125928a38dc8c3 Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Fri, 25 Dec 2020 17:28:31 +0800 Subject: [PATCH 292/329] =?UTF-8?q?1.=E5=8C=85=E8=A3=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=202.=E4=B8=80=E6=AC=A1=E6=80=A7=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/MesPackageQueryModel.java | 40 ++++++++++++++++ .../model/MesProduceSnDisposableQueryModel.java | 55 ++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java new file mode 100644 index 0000000..38eaaa0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPackage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/18 16:13 下午 + * @Description: 包装查询报表返回model + **/ +@Api("包装查询报表返回model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MesPackageQueryModel extends MesPackage { + @ApiParam("工序名称") + private String processName; + + @ApiParam("产线") + private String workCenterName; + + @ApiParam("工作单元名称") + private String workCellName; + + public MesPackageQueryModel(String workCenterName, String workCellName) { + this.workCenterName = workCenterName; + this.workCellName = workCellName; + } + + public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName) { + super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo); + this.processName=processName; + this.workCenterName = workCenterName; + this.workCellName = workCellName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java new file mode 100644 index 0000000..a391502 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/23 13:38 下午 + * @Description: 一次性通过率查询参数model + **/ +@Api("一次性通过率查询参数model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MesProduceSnDisposableQueryModel { + /** + * 必选 + */ + + @ApiParam("工序") + private String processCode; + + @ApiParam("统计方式") + private Integer statisticalPlacer; + + @ApiParam("质量类型") + private String qcStatus; + + /** + * 可选 + */ + @ApiParam("项目号") + private List prodCfgTypeCodeList; + + @ApiParam("零件号") + private List partNoList; + + @ApiParam("账号/工号") + private String userLoginName; + + @ApiParam("姓名") + private String userName; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; + +} From 7880fc96c9ea90e57038ab30e4d6b916760e3758 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 25 Dec 2020 20:30:43 +0800 Subject: [PATCH 293/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 1861799..58c5249 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -156,6 +156,19 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("行号") private String item; + + @ApiParam("应盘人") + public String detailsCreateUser; + + @ApiParam("应盘时间") + public String detailsCreateDatetime; + + @ApiParam("实盘人") + public String factCreateUser; + + @ApiParam("实盘时间") + public String factCreateDatetime; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { From 56630ccb0d3dc5ef09d27b4a5d61ad92165a14fd Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 27 Dec 2020 21:25:31 +0800 Subject: [PATCH 294/329] =?UTF-8?q?=E9=9D=99=E6=80=81=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 995ee1c..30d651d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -366,12 +366,13 @@ public class WmsPart extends BaseBean { this.partSpec = partSpec; } - public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) { + public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, String stockUnit, Integer snControl, Double qty) { this.partNo = partNo; this.partName = partName; this.partSpec = partSpec; this.snp = snp; this.buyUnit = buyUnit; + this.stockUnit = stockUnit; this.snControl = snControl; this.qty = qty; } From 3a98640d5dfc9c4a687a11025170d0ec3e334154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 28 Dec 2020 10:26:04 +0800 Subject: [PATCH 295/329] =?UTF-8?q?=E3=80=903063=20=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E5=93=81=E5=A4=84=E7=90=86=E6=A8=A1=E5=9D=97-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=20--=E5=90=8E=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 0dacf19..1346c2f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3699,4 +3699,12 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture) { + DdlPackBean packBean = getAllBaseData(mesProduceCtgyPicture.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean); + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getDefectLocation(), "defectLocation", packBean); + DdlPreparedPack.getNumEqualPack(mesProduceCtgyPicture.getIsValid(), "isValid", packBean); + return packBean; + } + } From cafac4312b4bce5ffe8ba775e2a04a35bce24594 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 28 Dec 2020 12:10:53 +0800 Subject: [PATCH 296/329] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 8 ++++---- .../main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 7358782..0c41f5c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -60,12 +60,12 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("数据查询类型") private Integer dataType = 1; - @Column(name = "LIMIT_TIMES") - @ApiParam("限定检测次数") - private Integer limitTimes; + @Column(name = "LIMIT_SPEL_EXPRESS") + @ApiParam("限定检测表达式") + private String limitSpelExpress; @Column(name = "RECORD_NUM_DESC") - @ApiParam("校验表达式描述") + @ApiParam("合格标准描述") private String recordNumDesc; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 09972c9..0f07531 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -22,9 +22,6 @@ public class DataReviewModel { @ApiParam("实际数量") private String realNum; - @ApiParam("限定次数") - private String limitTimes; - @ApiParam("检测次数") private String checkTimes; From e178bb8c67d27531148ee54929814011c1c1d571 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Mon, 28 Dec 2020 15:02:44 +0800 Subject: [PATCH 297/329] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8+=E6=8A=A5=E5=BA=9F=E5=8D=A0=E6=AF=94?= =?UTF-8?q?=E6=9F=8F=E6=8B=89=E5=9B=BE=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/report/DefectRecordModel.java | 4 +- .../pojo/mes/model/report/PackageTravelModel.java | 10 ++-- .../pojo/mes/model/report/ProductDetailResult.java | 65 ++++++++++++++++++++++ .../pojo/mes/model/report/ProductResult.java | 56 +++++++++++++++++++ .../model/report/ProductStatisticsQueryModel.java | 29 ++++++++++ ...apRateQueryModel.java => ReportQueryModel.java} | 4 +- .../pojo/mes/model/report/ScrapOfPlatoModel.java | 42 +++++++++++--- 7 files changed, 191 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/{ProcessScrapRateQueryModel.java => ReportQueryModel.java} (85%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java index c02fbb2..229c745 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java @@ -22,7 +22,7 @@ public class DefectRecordModel implements Serializable { @ApiParam("不良处理类型") private Integer defectActionType; - @ApiParam("不良处理类型Name") + @ApiParam("不良处理类型名称") private String defectActionTypeName; @ApiParam("缺陷名称") @@ -31,7 +31,7 @@ public class DefectRecordModel implements Serializable { @ApiParam("缺陷位置") private String defectLocation; - @ApiParam("缺陷位置") + @ApiParam("缺陷位置名称") private String defectLocationName; @ApiParam(value = "创建用户") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java index 14e0e68..f529288 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model.report; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -13,16 +14,14 @@ import java.io.Serializable; * @date 2020/12/18 17:16 **/ @Data +@NoArgsConstructor @ApiModel("产品履历报表-料箱信息") public class PackageTravelModel implements Serializable { private static final long serialVersionUID = -7031472442162953544L; - - @ApiParam("过程条码") - private String serialNumber; @ApiParam("料箱编号") @@ -37,7 +36,7 @@ public class PackageTravelModel implements Serializable { @ApiParam("料箱状态") private String useStatus; - @ApiParam("料箱状态Name") + @ApiParam("料箱状态名称") private String useStatusName; @ApiParam("物料码") @@ -55,10 +54,9 @@ public class PackageTravelModel implements Serializable { @ApiParam("执行动作") private Integer opType; - @ApiParam("执行动作Name") + @ApiParam("执行动作名称") private String opTypeName; - @ApiParam("执行时间") private String createDatetime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java new file mode 100644 index 0000000..263c977 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author yumingxing + * @version 1.0 + * @date 2020/12/24 18:57 + **/ +@Data +@NoArgsConstructor +@ApiModel("生产统计明细") +public class ProductDetailResult { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("零件描述") + private String partNameRdd; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工序") + private String processCode; + + @ApiParam("工序名称") + private String processName; + + @ApiParam("条码状态") + private String qcStatus; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; + + + public ProductDetailResult(String serialNumber, String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.processCode = processCode; + this.processName = processName; + this.qcStatus = qcStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java new file mode 100644 index 0000000..03a71fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @author yumingxing 生产总数 + * @version 1.0 + * @date 2020/12/24 18:57 + **/ +@Data +@NoArgsConstructor +public class ProductResult { + + @ApiParam("工作单元") + private String workCellCode; + @ApiParam("零件号") + private String partNo; + @ApiParam("零件描述") + private String partNameRdd; + @ApiParam("生产线") + private String workCenterCode; + @ApiParam("工序") + private String processCode; + @ApiParam("工序名称") + private String processName; + @ApiParam("生产总数") + private long totalProduction; + @ApiParam("合格数") + private long qualified; + @ApiParam("冻结数") + private long unqualified; + @ApiParam("报废数") + private long scrap; + @ApiParam("合格率") + private BigDecimal qualifiedRate; + @ApiParam("冻结率") + private BigDecimal unqualifiedRate; + @ApiParam("报废率") + private BigDecimal scrapRate; + + public ProductResult(String workCellCode,String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) { + this.workCellCode = workCellCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.processCode = processCode; + this.processName = processName; + this.qualified = qualified; + this.unqualified = unqualified; + this.scrap = scrap; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java new file mode 100644 index 0000000..317587c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * 生产统计 + * @author yumingxing + * @version 1.0 + * @date 2020/12/24 16:13 + **/ +@Data +public class ProductStatisticsQueryModel { + + @ApiParam("生产线") + private String workCenterCode; + @ApiParam("工序") + private String processCode; + @ApiParam("零件号") + private String partNo; + @ApiParam("开始日期") + private String modifyStartDate; + @ApiParam("结束日期") + private String modifyEndDate; + @ApiParam("质量状态") + private String qcStatus; + @ApiParam("过程条码") + private String serialNumber; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java similarity index 85% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java index c584d30..8b6d900 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java @@ -7,14 +7,12 @@ import lombok.Data; import java.util.List; /** - * 全工序报废率-查询条件-model * @author yumingxing * @version 1.0 * @date 2020/12/21 10:10 **/ @Data -@ApiModel("全工序报废率-查询条件") -public class ProcessScrapRateQueryModel { +public class ReportQueryModel { @ApiParam("工序") private List processCodeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java index de4cdfe..edad180 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java @@ -1,7 +1,12 @@ package cn.estsh.i3plus.pojo.mes.model.report; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; /** * 报废占比柏拉图Model @@ -10,17 +15,38 @@ import lombok.Data; * @date 2020/12/23 15:09 **/ @Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("报废占比柏拉图") public class ScrapOfPlatoModel { - @ApiParam("缺陷数") - private String numberOfDefects; - @ApiParam("缺陷类型") - private String defectType; - @ApiParam("缺陷类型名称") - private String defectTypeName; - @ApiParam("项目") - private String prodCfgTypeCode; @ApiParam("零件号") private String partNo; + @ApiParam("项目") + private String prodCfgTypeCode; + @ApiParam("缺陷代码") + private String defectCode; + @ApiParam("缺陷名称") + private String defectName; + @ApiParam("缺陷数") + private long numberOfDefects; + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("报废率") + private BigDecimal scrapRate; + @ApiParam("报废占比") + private BigDecimal scrapRatio; + @ApiParam("柏拉图报废占比") + private BigDecimal scrapRatioPlato; + + public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) { + this.partNo = partNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.defectCode = defectCode; + this.defectName = defectName; + this.numberOfDefects = numberOfDefects; + this.workCellCode = workCellCode; + } } From 747312eaa32b60ed13d50ce2c32a4d424b647f23 Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Mon, 28 Dec 2020 15:33:27 +0800 Subject: [PATCH 298/329] =?UTF-8?q?1.=E5=8C=85=E8=A3=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=202.=E4=B8=80=E6=AC=A1=E6=80=A7=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/report/ProduceDispPassPlatoModel.java | 38 +++++++++++++++++++ .../report/ProduceDispPassPlatoQueryModel.java | 44 ++++++++++++++++++++++ .../ProduceDispPassRateModel.java} | 12 +++--- .../ProduceDispPassRateQueryModel.java} | 10 +---- 4 files changed, 90 insertions(+), 14 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesProduceSnDisposableModel.java => report/ProduceDispPassRateModel.java} (67%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesProduceSnDisposableQueryModel.java => report/ProduceDispPassRateQueryModel.java} (81%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java new file mode 100644 index 0000000..ca3ec40 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/28 14:24 下午 + * @Description: 一次性通过率占比柏拉图报表model + **/ +@Api("一次性通过率占比柏拉图报表model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ProduceDispPassPlatoModel { + + @ApiParam("项目号") + private List prodCfgTypeCodeList; + + @ApiParam("零件号") + private List partNoList; + + @ApiParam("单项占比") + private BigDecimal singleRatio; + + @ApiParam("累计占比") + private BigDecimal cumulativeRatio; + + @ApiParam("缺陷数量") + private BigDecimal defectQty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java new file mode 100644 index 0000000..806e221 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/28 14:18 下午 + * @Description: 一次性通过率占比柏拉图报表查询参数model + **/ +@Api("一次性通过率占比柏拉图报表查询参数model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ProduceDispPassPlatoQueryModel { + /** + * 必选 + */ + + @ApiParam("工序") + private String processCode; + + @ApiParam("统计方式") + private Integer statisticalPlacer; + /** + * 可选 + */ + @ApiParam("项目号") + private List prodCfgTypeCodeList; + + @ApiParam("零件号") + private List partNoList; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java similarity index 67% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java index 0b444ce..d27e146 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model; +package cn.estsh.i3plus.pojo.mes.model.report; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -11,11 +11,11 @@ import java.math.BigDecimal; /** * @Author: xiangming.liao * @CreateDate: 2020/12/22 14:38 下午 - * @Description: 每个月的冻结数、报废数、生产总数返回model + * @Description: 每个月/天的冻结数、报废数、生产总数、占比回model **/ -@Api("每个月的冻结数、报废数、生产总数返回model") +@Api("每个月/天的冻结数、报废数、生产总数、占比返回model") @Data -public class MesProduceSnDisposableModel { +public class ProduceDispPassRateModel { @ApiParam("统计时间") private String statisticalTime; @@ -37,7 +37,7 @@ public class MesProduceSnDisposableModel { @ApiParam("占比率") private BigDecimal ratio; - public MesProduceSnDisposableModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { + public ProduceDispPassRateModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { this.statisticalTime = statisticalTime; this.qcStatus = qcStatus; this.statisticalOption = statisticalOption; @@ -47,6 +47,6 @@ public class MesProduceSnDisposableModel { this.ratio = ratio; } - public MesProduceSnDisposableModel() { + public ProduceDispPassRateModel() { } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java similarity index 81% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java index a391502..ed9dd7b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProduceSnDisposableQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model; +package cn.estsh.i3plus.pojo.mes.model.report; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -17,7 +17,7 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class MesProduceSnDisposableQueryModel { +public class ProduceDispPassRateQueryModel { /** * 必选 */ @@ -40,12 +40,6 @@ public class MesProduceSnDisposableQueryModel { @ApiParam("零件号") private List partNoList; - @ApiParam("账号/工号") - private String userLoginName; - - @ApiParam("姓名") - private String userName; - @ApiParam("开始时间") private String modifyStartDate; From 9a8515eeb944b22dd77abbdb571dfe349df1eadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 28 Dec 2020 15:38:10 +0800 Subject: [PATCH 299/329] =?UTF-8?q?=E3=80=9013470=2020027--BI=E8=AF=A6?= =?UTF-8?q?=E6=83=85----=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=83=85?= =?UTF-8?q?=E5=86=B5--=E5=B7=A5=E4=BD=8D=E5=90=88=E6=A0=BC=E7=8E=87?= =?UTF-8?q?=E6=B5=AE=E7=AA=97=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96----2020-12-28=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java index 73a1815..5ead779 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -25,4 +25,6 @@ public class ProductBiSeriesModel { private List snQtyList = new ArrayList<>(); @ApiParam("计划数量集合") private List planQtyList = new ArrayList<>(); + @ApiParam("零件号") + private String partNo; } From 6bd2d191a3815e7b1479e05b8632065c066cc49e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 28 Dec 2020 15:42:53 +0800 Subject: [PATCH 300/329] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=8E=87=E8=B6=8B=E5=8A=BF=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/ScrapRateTrendQueryModel.java | 39 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/TimeCountModel.java | 20 +++++++++++ .../estsh/i3plus/pojo/mes/model/TimeRateModel.java | 20 +++++++++++ 3 files changed, 79 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java new file mode 100644 index 0000000..f739965 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 卡斯马报废率趋势查询条件封装类 + * @Reference : + * @Author : dominic + * @CreateDate : 2020-12-24 16:35 + * @Modify: + **/ +@Data +@Api("报废率趋势查询条件封装类") +public class ScrapRateTrendQueryModel { + + @ApiParam("组织机构代码") + private String organizeCode; + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("开始时间") + private String startTime; + + @ApiParam("结束时间") + private String endTime; + + @ApiParam("时间类型") + private String timeType; + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("物料号") + private String partNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java new file mode 100644 index 0000000..4010f84 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 时间计数 + * @Reference : + * @Author : dominic + * @CreateDate : 2020/12/28 10:10 + * @Modify: + **/ +@Data +public class TimeCountModel { + @ApiParam("时间段") + private String time; + + @ApiParam("计数") + private Integer count; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java new file mode 100644 index 0000000..a4c2550 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 时间比率 + * @Reference : + * @Author : dominic + * @CreateDate : 2020/12/28 13:10 + * @Modify: + **/ +@Data +public class TimeRateModel { + @ApiParam("时间段") + private String time; + + @ApiParam("比率") + private double rate; +} From a86a189fc37633577b6937f19f114bf65b858c10 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 29 Dec 2020 12:04:15 +0800 Subject: [PATCH 301/329] =?UTF-8?q?13493=2020027-=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92--=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?= =?UTF-8?q?--2020-12-29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 92f4263..e839cc7 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 @@ -2813,6 +2813,15 @@ public class MesEnumUtil { } return tmp; } + + public static MES_QC_CHECK_TYPE getByValue(int value) { + for (MES_QC_CHECK_TYPE type : values()) { + if (type.getValue() == value) { + return type; + } + } + return null; + } } /** @@ -7705,6 +7714,15 @@ public class MesEnumUtil { } return tmp; } + + public static QC_CHECK_DATA_SOURCE getByValue(int value) { + for (QC_CHECK_DATA_SOURCE type : values()) { + if (type.getValue() == value) { + return type; + } + } + return null; + } } /** From 6bfc2f92b0dd2f3ffbb17d590956f0dfd029edb1 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 29 Dec 2020 16:59:49 +0800 Subject: [PATCH 302/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d487780..16afd40 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 @@ -871,7 +871,8 @@ public class WmsEnumUtil { OTHER_OUT(740, "OTHER_OUT", "其它出库"), COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"), SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), - COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR + COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR + PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库");//默认DMR private int value; private String code; From 0ee41dbda1a86046914f32202bbb4576efd76a15 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 29 Dec 2020 17:02:37 +0800 Subject: [PATCH 303/329] =?UTF-8?q?13500=2020027--=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E7=BB=8F=E7=90=86BI---=E4=BA=A7=E5=93=81=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E9=AA=8C--=E5=A6=82=E5=9B=BE=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E6=98=AF=E5=AE=8C=E6=88=90=E7=9A=84=EF=BC=8C=E4=BD=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=A6=96=E6=A3=80=E3=80=81=E6=9C=AB=E6=A3=80=E7=9A=84?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA=E9=A6=96=E6=A3=80=E6=98=AF?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=88=E6=A0=BC=E7=9A=84=EF=BC=8C=E6=9C=AB?= =?UTF-8?q?=E6=A3=80=E6=98=AF=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84---2020-1?= =?UTF-8?q?2-29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) 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 e839cc7..d42b6e7 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 @@ -8197,4 +8197,50 @@ public class MesEnumUtil { } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_PROCESS_CHECK_RESULT_TYPE { + YELLOW(5, "进行中"), + GREEN(10, "合格"), + RED(20, "不合格"); + + private int value; + private String description; + + PRODUCT_PROCESS_CHECK_RESULT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE getByValue(Integer value) { + for (MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE showSupplierCode : values()) { + if (showSupplierCode.getValue() == value) { + return showSupplierCode; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 0cec15c1bad57df51a22cb307161910ad61e4768 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 29 Dec 2020 17:36:30 +0800 Subject: [PATCH 304/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=A8=A1=E5=9D=97:=E7=82=89=E5=AD=90=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=94=B1=E4=B8=8E=E4=BD=8D=E7=BD=AE=E7=BB=91=E5=AE=9A=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=8E=E6=A8=A1=E5=BC=8F=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java | 4 ---- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 13 +++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java index dd6e895..e5c4ae0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -42,10 +42,6 @@ public class MesFurnaceLocation extends BaseBean implements Serializable { @ApiParam("炉内位置代码") private String fnLocationNo; - @Column(name = "MODEL_IMG_URL") - @ApiParam("模式图片路径") - private String modelImgUrl; - @Column(name = "SEQ") @ApiParam("推荐顺序") private Integer seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java index 8053275..560d696 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java @@ -40,4 +40,8 @@ public class MesPartFurnace extends BaseBean implements Serializable { @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; + + @Column(name = "MODEL_IMG_URL") + @ApiParam("模式图片路径") + private String modelImgUrl; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1346c2f..821f273 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2784,7 +2784,8 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());; + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode()); + ; if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) { DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean); } @@ -3627,11 +3628,11 @@ public class MesHqlPack { return packBean; } - public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) { - DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode()); - DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean); - DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean); - DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean); + public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) { + DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(partFurnace.getModelNo(), "modelNo", packBean); + DdlPreparedPack.getNumEqualPack(partFurnace.getIsValid(), "isValid", packBean); return packBean; } From 1081b3a972c9b053e3cc6eefabdb618c96256a35 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Tue, 29 Dec 2020 18:07:31 +0800 Subject: [PATCH 305/329] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java index 9589f43..5762969 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java @@ -21,6 +21,9 @@ public class ProcessScrapRate { @ApiParam("工序") private String processCode; + @ApiParam("工序名称") + private String processName; + @ApiParam("项目号") private String prodCfgTypeCode; @@ -31,8 +34,9 @@ public class ProcessScrapRate { private BigDecimal scrapRate; - public ProcessScrapRate(String processCode, String prodCfgTypeCode, String workCellCode) { + public ProcessScrapRate(String processCode,String processName, String prodCfgTypeCode, String workCellCode) { this.processCode = processCode; + this.processName = processName; this.prodCfgTypeCode = prodCfgTypeCode; this.workCellCode = workCellCode; } From d3013321626c48642804e1725eeda8aecc747102 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Dec 2020 15:00:10 +0800 Subject: [PATCH 306/329] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index e57acaf..f611147 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 8edd1cc336d094dcde18819aa6c658c625201a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Dec 2020 10:37:05 +0800 Subject: [PATCH 307/329] =?UTF-8?q?=E3=80=903057=20=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=B1=A5=E5=8E=86=E6=8A=A5=E8=A1=A8=20-=20=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=BC=80=E5=8F=91=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/mes/bean/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 75b2b57..af06a6a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -203,6 +203,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam(value = "生产线名称") private String workCenterName; + @Transient + @ApiParam("工序名称") + private String processName; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1c1a2b0..0dacf19 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3692,7 +3692,8 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getCtNo(), "ctNo", packBean); DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean); DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean); return packBean; From 36d4f0ac10acb0779e51b02edf4d70558c725c95 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 15:57:36 +0800 Subject: [PATCH 308/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 10c0680..aa83a19 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; @@ -214,6 +214,29 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster() { } + + public WmsMoveMaster(String organizeCode, String partNo, String partNameRdd, String transTypeCode, + String transTypeName, String unit, String destZoneNo, Double transQty, Double handledQty, Double rejectQty, + Integer busiTypeCode, String createDatetime, String createUser, String modifyUser, + String modifyDatetime, String refSrc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.unit = unit; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.handledQty = handledQty; + this.rejectQty = rejectQty; + this.busiTypeCode = busiTypeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.refSrc = refSrc; + } + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark, String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId, From 183a642c526c89af90eefe6282db385130a69c36 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Dec 2020 17:21:56 +0800 Subject: [PATCH 309/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=20=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E5=A2=9E=E5=8A=A0=20=E6=A8=A1=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 969ad3f..5e86d59 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -89,8 +89,9 @@ public class AndonEnumUtil { QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"), PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"), ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"), - OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"), + OTHER_ALARM_CALL("OTHER_ALARM_CALL", "工装呼叫弹框界面"), FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"), + MODULE_ALARM_CALL("MODULE_ALARM_CALL", "模具呼叫弹框界面"), ALARM_SIGN("ALARM_SIGN", "响应弹框界面"), ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"), ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面"); @@ -1218,7 +1219,8 @@ public class AndonEnumUtil { PART("PART_ALARM", 110060104, "物料", "#24BDBA"), PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"), CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"), - FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"); + FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"), + MOULD("MOULD_ALARM", 160060111, "模具", "#0A8BEE"); private String value; private Integer code; From 4937b49281a7fbd6ee663c8f9e362b60442d0a3d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 19:27:43 +0800 Subject: [PATCH 310/329] =?UTF-8?q?Fix=20bug#13411=20ASN=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=90=8E=E6=9C=AA=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsGcdcContainerModel.java | 169 +++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java new file mode 100644 index 0000000..5a4bd32 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -0,0 +1,169 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : GCDC集装箱model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-11-24 18:17 + * @Modify: + **/ +@Data +@Api("GCDC集装箱model") +public class WmsGcdcContainerModel extends BaseBean { + + @ApiParam("移库单号号") + public String orderNo; + + @ApiParam("库存移动单号") + public String moveNo; + + @ApiParam("条码") + public String sn; + + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + @ApiParam(value = "客户编号") + private String custNo; + + @ApiParam(value = "单据状态") + public Integer orderStatus; + + @ApiParam(value = "库存移动单状态") + public Integer itemStatus; + + @ApiParam(value = "包装编号") + private String packageNo; + + @ApiParam("集装箱号") + private String containerNo; + + @ApiParam("产地") + private String productPlace; + + @ApiParam("托盘重量") + private Double packageWeight; + + @ApiParam(value = "客户名称") + public String custNameRdd; + + @ApiParam(value = "业务类型") + public Integer busiType; + + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @ApiParam(value = "物料号") + public String partNo; + + @ApiParam(value = "物料号") + public String partNameRdd; + + @ApiParam(value = "客户地址") + private String custAddr; + + @ApiParam(value = "客户联系人") + private String custOwner; + + @ApiParam(value = "客户电话号码") + private String custTel; + + @ApiParam(value = "是否集装箱号") + private Integer isContainer; + + @ApiParam("移库单号集合") + private List orderNoList; + + @ApiParam("库存移动单号集合") + private List moveNoList; + + @ApiParam("库存移动单条码集合") + private List moveSnList; + + @ApiParam("库存条码集合") + private List stockSnList; + + @ApiParam(value = "打印队列物料库存集合") + private List wmsPartStockModels; + + @ApiParam(value = "仓库代码") + private String whNo; + + @ApiParam(value = "存储区编号") + private String zoneNo; + + @ApiParam(value = "库位代码") + private String locateNo; + + @ApiParam(value = "客户发往地名称") + private String flagName; + + @ApiParam(value = "客户发往地代码") + private String flagNo; + + @ApiParam(value = "是否绑定发运") + private Integer isBindingShip = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + public WmsGcdcContainerModel() { + } + + public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo, + Integer orderStatus, String createDatetime, String createUser) { + this.id = id; + this.orderNo = orderNo; + this.moveNo = moveNo; + this.erpSrcNo = erpSrcNo; + this.custNo = custNo; + this.orderStatus = orderStatus; + this.createDatetime = createDatetime; + this.createUser = createUser; + } + + public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo, + Integer itemStatus, String createDatetime, String createUser, Integer busiType) { + this.id = id; + this.orderNo = orderNo; + this.moveNo = moveNo; + this.erpSrcNo = erpSrcNo; + this.custNo = custNo; + this.itemStatus = itemStatus; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.busiType = busiType; + } + + public WmsGcdcContainerModel(Long id, String orderNo, String packageNo, Double packageWeight, String custNo, String partNo, String flagNo) { + this.id = id; + this.orderNo = orderNo; + this.packageNo = packageNo; + this.packageWeight = packageWeight; + this.custNo = custNo; + this.partNo = partNo; + this.flagNo = flagNo; + } + + public WmsGcdcContainerModel(Long id, String organizeCode, Double packageWeight, String packageNo, String zoneNo, + String locateNo, String whNo, String partNo, String partNameRdd, String custNo, String flagNo) { + this.id = id; + this.organizeCode = organizeCode; + this.packageWeight = packageWeight; + this.packageNo = packageNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.whNo = whNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.custNo = custNo; + this.flagNo = flagNo; + } +} From 8657926eee741f9db8447d323674783218da1f9c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 19:28:23 +0800 Subject: [PATCH 311/329] =?UTF-8?q?Fix=20bug#13411=20ASN=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=90=8E=E6=9C=AA=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java index 5a4bd32..3b23ea7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -93,9 +93,6 @@ public class WmsGcdcContainerModel extends BaseBean { @ApiParam("库存条码集合") private List stockSnList; - @ApiParam(value = "打印队列物料库存集合") - private List wmsPartStockModels; - @ApiParam(value = "仓库代码") private String whNo; From 605d6205657ca0882ff68e6bf159d4910b588a00 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 24 Dec 2020 14:40:14 +0800 Subject: [PATCH 312/329] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 28 ++++++++++++ .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ++++++++++++++++++++++ .../MesWorkCellJumpRecordRepository.java | 16 +++++++ 3 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java 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 b2c21d4..0c83988 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 @@ -6068,4 +6068,32 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * MesWorkCellJumpRecord 跳过类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_JUMP_TYPE { + + SERIAL_SN(10, "过程条码"), + PRODUCT_SN(20, "产品条码"), + PACK_SN(30, "包装条码"), + OTHER(40, "其他"); + + private int value; + private String description; + + MES_WORK_CELL_JUMP_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java new file mode 100644 index 0000000..de9d7e6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java @@ -0,0 +1,52 @@ +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 : wangjie + * @CreateDate : 2020-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WORK_CELL_JUMP_RECORD") +@Api("mes工位操作跳过记录表") +public class MesWorkCellJumpRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1017369816822438021L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "JUMP_TYPE") + @ApiParam("跳过类型 10=过程条码") + private Integer jumpType; + + @Column(name = "JUMP_VALUE") + @ApiParam("跳过值") + private String jumpValue; + + @Column(name = "JUMP_DESC") + @ApiParam("跳过描述") + private String jumpDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java new file mode 100644 index 0000000..6a3f7a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellJumpRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellJumpRecordRepository extends BaseRepository { +} From 0db629a2a1b4764235836c48e1d9e2af72e536da Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 24 Dec 2020 15:20:05 +0800 Subject: [PATCH 313/329] =?UTF-8?q?BUG=20#13415=2019058-=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=EF=BC=8C=E7=94=9F=E6=88=90=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=9C=80=E8=A6=81=E6=8A=8A=E5=8E=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7=E4=BD=9C=E4=B8=BA=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=9C=A8=E7=95=8C=E9=9D=A2=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index e0654fb..0f4a349 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -6,16 +6,11 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel; 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.Transient; +import javax.persistence.*; import java.util.List; /** @@ -137,6 +132,11 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("调拨单录入字段") private String defectiveAllocation; + //关联单号 + @Column(name="ORDER_NO") + @ApiParam("关联单号") + private String orderNo; + // @Transient // @ApiParam("打印模板列表") // private String defectiveAllocation; From 129002573c6e818e3f403477bf162e1e325e007b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 24 Dec 2020 19:24:21 +0800 Subject: [PATCH 314/329] Fix bug#13399 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 21 ++++++++-- .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 7 +++- 3 files changed, 68 insertions(+), 5 deletions(-) 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 90446fd..d487780 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 @@ -9494,6 +9494,51 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 报废类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRAP_TYPE { + ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"), + AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废"); + + private int value; + private String code; + private String description; + + SCRAP_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 077a83c..295096f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -8,14 +8,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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 lombok.ToString; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -269,6 +273,17 @@ public class WmsDocMovementMaster extends BaseBean { isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue") private String fourthRemake; + + /** + * + */ + @Column(name = "SCRAP_TYPE") + @ApiParam("报废类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description") + public Integer scrapType; + + + @Column(name = "IS_REMOVE_ORDER") @ApiParam(value = "是否撤销单据") private Integer isRemoveOrder = CommonEnumUtil.FALSE; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index ca32ae5..c16b143 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** @@ -96,6 +96,9 @@ public class WmsPartExtend extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotControl; + /** + * 单位：天 + */ @Column(name = "RANGE_LOT") @ApiParam(value = "批次容差") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) From d1532067b721fae1c8b4486439b6d27391d40ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 28 Dec 2020 10:26:04 +0800 Subject: [PATCH 315/329] =?UTF-8?q?=E3=80=903063=20=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E5=93=81=E5=A4=84=E7=90=86=E6=A8=A1=E5=9D=97-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=20--=E5=90=8E=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 0dacf19..1346c2f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3699,4 +3699,12 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture) { + DdlPackBean packBean = getAllBaseData(mesProduceCtgyPicture.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean); + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getDefectLocation(), "defectLocation", packBean); + DdlPreparedPack.getNumEqualPack(mesProduceCtgyPicture.getIsValid(), "isValid", packBean); + return packBean; + } + } From b843db89d9a2402ac2643ad6840ec08e2fb69cae Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 27 Dec 2020 21:25:31 +0800 Subject: [PATCH 316/329] =?UTF-8?q?=E9=9D=99=E6=80=81=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 995ee1c..30d651d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -366,12 +366,13 @@ public class WmsPart extends BaseBean { this.partSpec = partSpec; } - public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) { + public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, String stockUnit, Integer snControl, Double qty) { this.partNo = partNo; this.partName = partName; this.partSpec = partSpec; this.snp = snp; this.buyUnit = buyUnit; + this.stockUnit = stockUnit; this.snControl = snControl; this.qty = qty; } From a9fc8ae132a21c36615d47a54f3388827b27167c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 25 Dec 2020 13:37:31 +0800 Subject: [PATCH 317/329] =?UTF-8?q?=E5=96=9C=E5=BE=B7WMS=EF=BC=9ABUG#13293?= =?UTF-8?q?=EF=BC=8C13295=EF=BC=8C13294?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 18 ++++++++++++++++++ 1 file changed, 18 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 7d27d82..5ba84cf 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 @@ -740,4 +740,22 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.destLocateName = locateName; } + public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo,Integer moveType, Integer busiType, + String item, String partNo, String partNameRdd,String unit, Double qty, + Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) { + this.organizeCode = organizeCode; + this.workOrderCode = workOrderCode; + this.orderNo = orderNo; + this.moveType = moveType; + this.busiType = busiType; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.qty = qty; + this.isSn = isSn; + this.orderMasterStatus = orderMasterStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + } } From 0906539b82ba982f5dd345c7d59d85d24347f124 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 25 Dec 2020 11:48:29 +0800 Subject: [PATCH 318/329] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ---------------------- .../MesWorkCellJumpRecordRepository.java | 16 ------- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java 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 0c83988..c03278f 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 @@ -4231,6 +4231,7 @@ public class MesPcnEnumUtil { public enum PRODUCE_ERROR_RECORD { JUMP_PROCESS(10, "跳过工序"), JUMP_STEP(20, "跳过工步"), + JUMP_STEP_IN_STATE(25, "跳过状态点中的工步"), JUMP_STATE(30, "跳过状态点"), ABNORMAL_DEDUCTION(40, "扣减异常"), REDO_STATION(50, "工位重做"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java deleted file mode 100644 index de9d7e6..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java +++ /dev/null @@ -1,52 +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 : wangjie - * @CreateDate : 2020-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_WORK_CELL_JUMP_RECORD") -@Api("mes工位操作跳过记录表") -public class MesWorkCellJumpRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1017369816822438021L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "JUMP_TYPE") - @ApiParam("跳过类型 10=过程条码") - private Integer jumpType; - - @Column(name = "JUMP_VALUE") - @ApiParam("跳过值") - private String jumpValue; - - @Column(name = "JUMP_DESC") - @ApiParam("跳过描述") - private String jumpDesc; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java deleted file mode 100644 index 6a3f7a7..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellJumpRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellJumpRecordRepository extends BaseRepository { -} From db8c01b64c4e279f0dd095091eec57e8771a765c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 25 Dec 2020 20:30:43 +0800 Subject: [PATCH 319/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 1861799..58c5249 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -156,6 +156,19 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("行号") private String item; + + @ApiParam("应盘人") + public String detailsCreateUser; + + @ApiParam("应盘时间") + public String detailsCreateDatetime; + + @ApiParam("实盘人") + public String factCreateUser; + + @ApiParam("实盘时间") + public String factCreateDatetime; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { From b25641e02b50e6ccee23dde78641495994737f7d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 28 Dec 2020 12:10:53 +0800 Subject: [PATCH 320/329] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 8 ++++---- .../main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 7358782..0c41f5c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -60,12 +60,12 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("数据查询类型") private Integer dataType = 1; - @Column(name = "LIMIT_TIMES") - @ApiParam("限定检测次数") - private Integer limitTimes; + @Column(name = "LIMIT_SPEL_EXPRESS") + @ApiParam("限定检测表达式") + private String limitSpelExpress; @Column(name = "RECORD_NUM_DESC") - @ApiParam("校验表达式描述") + @ApiParam("合格标准描述") private String recordNumDesc; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 09972c9..0f07531 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -22,9 +22,6 @@ public class DataReviewModel { @ApiParam("实际数量") private String realNum; - @ApiParam("限定次数") - private String limitTimes; - @ApiParam("检测次数") private String checkTimes; From 11e2d8e9f98f03e47c33b3b6f2b7e81b16b10209 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 28 Dec 2020 15:42:53 +0800 Subject: [PATCH 321/329] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=8E=87=E8=B6=8B=E5=8A=BF=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/ScrapRateTrendQueryModel.java | 39 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/TimeCountModel.java | 20 +++++++++++ .../estsh/i3plus/pojo/mes/model/TimeRateModel.java | 20 +++++++++++ 3 files changed, 79 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java new file mode 100644 index 0000000..f739965 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 卡斯马报废率趋势查询条件封装类 + * @Reference : + * @Author : dominic + * @CreateDate : 2020-12-24 16:35 + * @Modify: + **/ +@Data +@Api("报废率趋势查询条件封装类") +public class ScrapRateTrendQueryModel { + + @ApiParam("组织机构代码") + private String organizeCode; + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("开始时间") + private String startTime; + + @ApiParam("结束时间") + private String endTime; + + @ApiParam("时间类型") + private String timeType; + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("物料号") + private String partNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java new file mode 100644 index 0000000..4010f84 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 时间计数 + * @Reference : + * @Author : dominic + * @CreateDate : 2020/12/28 10:10 + * @Modify: + **/ +@Data +public class TimeCountModel { + @ApiParam("时间段") + private String time; + + @ApiParam("计数") + private Integer count; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java new file mode 100644 index 0000000..a4c2550 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 时间比率 + * @Reference : + * @Author : dominic + * @CreateDate : 2020/12/28 13:10 + * @Modify: + **/ +@Data +public class TimeRateModel { + @ApiParam("时间段") + private String time; + + @ApiParam("比率") + private double rate; +} From f4ffa95c4bb59baf89dde853099c74967fbfdf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 28 Dec 2020 15:38:10 +0800 Subject: [PATCH 322/329] =?UTF-8?q?=E3=80=9013470=2020027--BI=E8=AF=A6?= =?UTF-8?q?=E6=83=85----=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=83=85?= =?UTF-8?q?=E5=86=B5--=E5=B7=A5=E4=BD=8D=E5=90=88=E6=A0=BC=E7=8E=87?= =?UTF-8?q?=E6=B5=AE=E7=AA=97=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96----2020-12-28=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java index 73a1815..5ead779 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -25,4 +25,6 @@ public class ProductBiSeriesModel { private List snQtyList = new ArrayList<>(); @ApiParam("计划数量集合") private List planQtyList = new ArrayList<>(); + @ApiParam("零件号") + private String partNo; } From 9ba8ae781d18562d548a7756aef1e754b5d92391 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 29 Dec 2020 12:04:15 +0800 Subject: [PATCH 323/329] =?UTF-8?q?13493=2020027-=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92--=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?= =?UTF-8?q?--2020-12-29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 92f4263..e839cc7 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 @@ -2813,6 +2813,15 @@ public class MesEnumUtil { } return tmp; } + + public static MES_QC_CHECK_TYPE getByValue(int value) { + for (MES_QC_CHECK_TYPE type : values()) { + if (type.getValue() == value) { + return type; + } + } + return null; + } } /** @@ -7705,6 +7714,15 @@ public class MesEnumUtil { } return tmp; } + + public static QC_CHECK_DATA_SOURCE getByValue(int value) { + for (QC_CHECK_DATA_SOURCE type : values()) { + if (type.getValue() == value) { + return type; + } + } + return null; + } } /** From 9dbfc00e6f4fa9398fe85951fc8b53cb93e659fb Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 29 Dec 2020 17:02:37 +0800 Subject: [PATCH 324/329] =?UTF-8?q?13500=2020027--=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E7=BB=8F=E7=90=86BI---=E4=BA=A7=E5=93=81=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E9=AA=8C--=E5=A6=82=E5=9B=BE=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E6=98=AF=E5=AE=8C=E6=88=90=E7=9A=84=EF=BC=8C=E4=BD=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=A6=96=E6=A3=80=E3=80=81=E6=9C=AB=E6=A3=80=E7=9A=84?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA=E9=A6=96=E6=A3=80=E6=98=AF?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=88=E6=A0=BC=E7=9A=84=EF=BC=8C=E6=9C=AB?= =?UTF-8?q?=E6=A3=80=E6=98=AF=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84---2020-1?= =?UTF-8?q?2-29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) 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 e839cc7..d42b6e7 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 @@ -8197,4 +8197,50 @@ public class MesEnumUtil { } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_PROCESS_CHECK_RESULT_TYPE { + YELLOW(5, "进行中"), + GREEN(10, "合格"), + RED(20, "不合格"); + + private int value; + private String description; + + PRODUCT_PROCESS_CHECK_RESULT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE getByValue(Integer value) { + for (MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE showSupplierCode : values()) { + if (showSupplierCode.getValue() == value) { + return showSupplierCode; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From a82d6573667e0e733c6f2b9de81146c853071f5e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 29 Dec 2020 16:59:49 +0800 Subject: [PATCH 325/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d487780..16afd40 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 @@ -871,7 +871,8 @@ public class WmsEnumUtil { OTHER_OUT(740, "OTHER_OUT", "其它出库"), COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"), SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), - COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR + COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR + PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库");//默认DMR private int value; private String code; From 5e8e563a81974037b86cb2db2cb1b6bb3bd717eb Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 29 Dec 2020 17:36:30 +0800 Subject: [PATCH 326/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=A8=A1=E5=9D=97:=E7=82=89=E5=AD=90=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=94=B1=E4=B8=8E=E4=BD=8D=E7=BD=AE=E7=BB=91=E5=AE=9A=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=8E=E6=A8=A1=E5=BC=8F=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java | 4 ---- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 13 +++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java index dd6e895..e5c4ae0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -42,10 +42,6 @@ public class MesFurnaceLocation extends BaseBean implements Serializable { @ApiParam("炉内位置代码") private String fnLocationNo; - @Column(name = "MODEL_IMG_URL") - @ApiParam("模式图片路径") - private String modelImgUrl; - @Column(name = "SEQ") @ApiParam("推荐顺序") private Integer seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java index 8053275..560d696 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java @@ -40,4 +40,8 @@ public class MesPartFurnace extends BaseBean implements Serializable { @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; + + @Column(name = "MODEL_IMG_URL") + @ApiParam("模式图片路径") + private String modelImgUrl; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1346c2f..821f273 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2784,7 +2784,8 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());; + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode()); + ; if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) { DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean); } @@ -3627,11 +3628,11 @@ public class MesHqlPack { return packBean; } - public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) { - DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode()); - DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean); - DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean); - DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean); + public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) { + DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(partFurnace.getModelNo(), "modelNo", packBean); + DdlPreparedPack.getNumEqualPack(partFurnace.getIsValid(), "isValid", packBean); return packBean; } From f51ad83cc0bcafc672343a168892c140503edc80 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Wed, 30 Dec 2020 14:47:35 +0800 Subject: [PATCH 327/329] =?UTF-8?q?=E8=BF=94=E4=BF=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E3=80=90=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81=E3=80=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 821f273..af23ef0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2206,7 +2206,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(defectRecord.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(defectRecord.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringEqualPack(defectRecord.getSerialNumber(), "serialNumber", packBean); } if (!StringUtils.isEmpty(defectRecord.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCenterCode(), "workCenterCode", packBean); @@ -2218,7 +2218,10 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(defectRecord.getDefectCode(), "defectCode", packBean); } if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) { - DdlPreparedPack.getStringLikerPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getProductSn())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) { DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean); From aae3fb25391d52f2100b1c6d3df293f5ecf93f9e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 31 Dec 2020 11:32:38 +0800 Subject: [PATCH 328/329] =?UTF-8?q?=E3=80=90=E6=9C=AA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E4=BA=A4-=E4=BC=98=E5=8C=96?= =?UTF-8?q?=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/bean/WmsPart.java | 6 ++++++ .../cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 30d651d..6fc02ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -304,6 +304,11 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer limitQualityDays; + @Column(name = "WEIGHT") + @ApiParam(value = "重量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double weight ; + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); @@ -320,6 +325,7 @@ public class WmsPart extends BaseBean { return partVol == null ? 0 : partVol; } + public Double getWeightVal() { return this.weight == null ? 0d : this.weight.doubleValue(); } public Double getQty() { return qty == null ? 0 : qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java index 3b23ea7..4091b66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -111,6 +111,9 @@ public class WmsGcdcContainerModel extends BaseBean { @ApiParam(value = "是否绑定发运") private Integer isBindingShip = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @ApiParam("交易类型名称") + private String transTypeName; + public WmsGcdcContainerModel() { } @@ -126,10 +129,11 @@ public class WmsGcdcContainerModel extends BaseBean { this.createUser = createUser; } - public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo, + public WmsGcdcContainerModel(Long id, String orderNo,String transTypeCode, String moveNo, String erpSrcNo, String custNo, Integer itemStatus, String createDatetime, String createUser, Integer busiType) { this.id = id; this.orderNo = orderNo; + this.transTypeCode = transTypeCode; this.moveNo = moveNo; this.erpSrcNo = erpSrcNo; this.custNo = custNo; From 2740830e8f22d2db1d7b431361f1e856b3822264 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 6 Jan 2021 10:55:21 +0800 Subject: [PATCH 329/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..3751cf9 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..a6c1bea 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..0a2f9d4 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..2bf0e5c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..557548a 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..34a7337 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..670eb15 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..ce2dc01 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..b8c9643 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..1d29933 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..284225c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..7ff16c9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..353a02b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..b125cee 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..c9d54a9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..39f1e2f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..df01041 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f611147..a18cef1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..ae014e9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./