From 1d5f4b38a4d274572a715273140f5fdf3c5ba552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 6 Dec 2019 09:47:32 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E3=80=90KT-1282=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E7=8F=AD=E6=AC=A1=E7=AE=A1=E7=90=86?= =?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/sqlpack/WmsHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 d23756e..ce2f35b 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 @@ -2561,9 +2561,9 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsShiftRest(WmsShiftRest wmsShiftRest) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsShiftRest.getShiftNo(), "shiftNo", result); - DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestNo(), "restNo", result); - DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestName(), "restName", result); + DdlPreparedPack.getStringEqualPack(wmsShiftRest.getShiftNo(), "shiftNo", result); + DdlPreparedPack.getStringEqualPack(wmsShiftRest.getRestNo(), "restNo", result); + DdlPreparedPack.getStringEqualPack(wmsShiftRest.getRestName(), "restName", result); getStringBuilderPack(wmsShiftRest, result); From 8dc151394715e7c22c544216bb31ccd65f137600 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 6 Dec 2019 14:54:13 +0800 Subject: [PATCH 02/11] =?UTF-8?q?bug`6897`=20SOP=E4=BF=A1=E6=81=AF-?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=BE=E7=89=87=E5=90=8E=E6=9C=AA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=87=BA=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 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 368abef..b3c14e1 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 @@ -477,10 +477,6 @@ public class MesHqlPack { public static DdlPackBean getEsopExcludeById(MesEsop esop, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(esop.getRouteCode(), "routeCode", packBean); - DdlPreparedPack.getStringEqualPack(esop.getProcessCode(), "processCode", packBean); - DdlPreparedPack.getStringEqualPack(esop.getStepCode(), "stepCode", packBean); - DdlPreparedPack.getNumEqualPack(esop.getStepSeq(), "stepSeq", packBean); DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean); @@ -1055,16 +1051,9 @@ public class MesHqlPack { */ public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); - if (!StringUtils.isEmpty(pcnSyncCfg.getObjectCode())) { - DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); - } - if (!StringUtils.isEmpty(pcnSyncCfg.getPcnCode())) { - DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); - } - if (null != pcnSyncCfg.getSyncType()) { - DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); - } - + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); + DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); return packBean; } From 1f4a8d6e557f4d14886b594131064b444eb85aba Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 6 Dec 2019 20:10:43 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E3=80=90=E5=AE=89=E7=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9E=9A=E4=B8=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 12 +++--- .../estsh/i3plus/pojo/mes/pcn/bean/MesAction.java | 46 +++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesActionMethod.java | 47 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 4 ++ .../pcn/repository/MesActionMethodRepository.java | 16 ++++++++ .../mes/pcn/repository/MesActionRepository.java | 17 ++++++++ .../pcn/repository/MesEventActionRepository.java | 17 ++++++++ .../mes/pcn/repository/MesMethodRepository.java | 17 ++++++++ .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 7 +++- 9 files changed, 176 insertions(+), 7 deletions(-) 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/MesActionMethod.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/MesEventActionRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java 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 f435f19..b8293b6 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 @@ -947,12 +947,12 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - PART("PART_ALARM", 110060205, "物料"), - QUALITY("QUALITY_ALARM", 110060206, "质量"), - EQUIP("EQUMENT_ALARM", 110060207, "设备"), - PROCESS("ROUTING_ALARM", 110060208, "工艺"), - CHECK("OTHER_ALARM", 110060209, "自处理"), - FIX_ERROR("FIX_ERROR", 110060210, "自动报警"); + PART("PART_ALARM", 110060104, "物料"), + QUALITY("QUALITY_ALARM", 110060105, "质量"), + EQUIP("EQUMENT_ALARM", 110060106, "设备"), + PROCESS("ROUTING_ALARM", 110060107, "工艺"), + CHECK("OTHER_ALARM", 110060108, "自处理"), + FIX_ERROR("FIX_ERROR", 110060109, "自动报警"); private String value; private Integer code; 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..df5d1dc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 : 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 { + @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/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..a6ab494 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.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; + +/** + * @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 { + @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/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index a853af3..f6805e0 100644 --- 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 @@ -203,6 +203,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("mes生产工单页面按钮控制") private MesButtonFlagModel mesButtonFlagModel; + @Transient + @ApiParam("批量打包开窗页面查询工单=1") + private String pageType; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } 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/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/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/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 5b731c2..9fc108a 100644 --- 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 @@ -126,8 +126,13 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } - if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { + 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); From 67b5069c4845114ffdc3214d3cecddb34820216b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 7 Dec 2019 23:20:06 +0800 Subject: [PATCH 04/11] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 6 ++++++ 1 file changed, 6 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 eee5432..d707fe8 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 @@ -56,6 +56,12 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "SRC_WHERE", length = 255) public String srcWhere; + + /** + * 来源表的分组条件，按分组发送，多个列名用半角逗号分隔 + */ + @Column(name = "SRC_GROUP_COLUMNS", length = 255) + public String srcGroupColumns; /** * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔 * 例如：SYNFLG=Y,SYNDATE={#XX} From 9b8675c9043e9bce8ee946ed01440cf0263ec466 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 9 Dec 2019 09:38:56 +0800 Subject: [PATCH 05/11] =?UTF-8?q?task=20`1292-1`=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=B1=A5=E5=8E=86=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/pcn/bean/MesProduceSnTravel.java | 10 +++++++++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) 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 index bd8d086..c9bbc09 100644 --- 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 @@ -112,7 +112,15 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("客户零件号") private String custPartNo; - @Column(name="OPERATE_TYPE") + @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; 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 d3d073b..3da8adb 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 @@ -112,6 +112,14 @@ public class MesProduceSnTravel extends BaseBean { @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; From c7d4253e5ef07ccc5a79bbd1ebc7d7e8aadb55ed Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Mon, 9 Dec 2019 14:36:59 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E3=80=90bug=206872=20-=20=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E5=8F=91=E8=BF=90=E7=9C=8B=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E5=8A=A0=E8=BD=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 93 ++++++++++++++++++++++ 1 file changed, 93 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 385c27e..652aa48 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 @@ -4304,4 +4304,97 @@ public class WmsEnumUtil { } } + /** + * 收货看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RECEIVING_GOODS_STATUS { + WAIT_RECEIVING(10, "待收货"), + RECEIVING(20, "收货中"), + COMPLETE_RECEIVING(30, "收货完成"), + UN_RECEIVED(40, "延迟未收货"), + ELSE(50,"其他"); + + private int value; + private String description; + + RECEIVING_GOODS_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static RECEIVING_GOODS_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** + * 发运看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINAL_SHIPMENT_STATUS { + CREATE(10, "新建"), + PROCESSING(20, "处理中"), + COMPLETE(30, "已完成"); + + private int value; + private String description; + + FINAL_SHIPMENT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static FINAL_SHIPMENT_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + } \ No newline at end of file From bba25ad2de59f36566dfcc6a0d700c3ea2e81402 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 9 Dec 2019 14:52:41 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8C=85model?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java | 4 ---- 1 file changed, 4 deletions(-) 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 index fc94a50..ba753cc 100644 --- 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 @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -67,9 +66,6 @@ public class ProdPackageModel { @ApiParam("包装集合") private List packageList; - @ApiParam("工单集合") - private List workOrderList; - @ApiParam("打印状态文字") private String printStrStatus; From 222e1b020d1227fa799643c2a5e2528ced4b9bac Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 9 Dec 2019 19:27:12 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 2589083..0eaaeaa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -36,10 +36,15 @@ public class ImportDetail extends BaseAPS { @ApiParam(value ="内部表名") private String inName; - @Column(name="TYPE") + @Column(name="IMPORT_TYPE") @ApiParam(value ="导入类型") @FieldAnnotation(defaultValue = "REPLACE") - private ApsEnumUtil.IMPORT_DETAIL_TYPE type; + private ApsEnumUtil.IMPORT_DETAIL_TYPE importType; + + @Column(name="SKIP_ROWS") + @ApiParam(value ="跳过行数") + @FieldAnnotation(defaultValue = "0") + private Integer skipRows; @Column(name="ORDER_NUMBER") @ApiParam(value ="序号") From efb29aa8f4d8fc479862d0b834478d3c29dcfd28 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 9 Dec 2019 19:48:00 +0800 Subject: [PATCH 09/11] =?UTF-8?q?task=20`1294-1`=20=E6=9F=A5=E6=89=BEworkc?= =?UTF-8?q?ell=E7=9A=84=E6=97=B6=E5=80=99=E9=9C=80=E8=A6=81=E5=B8=A6?= =?UTF-8?q?=E4=B8=8A=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java | 4 ++++ 5 files changed, 15 insertions(+), 7 deletions(-) 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 index b4fff69..87fcaeb 100644 --- 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 @@ -120,9 +120,9 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; - @Column(name = "TRAY") + @Column(name = "TRAY_NO") @ApiParam("托盘号") - private String tray; + private String trayNo; @Transient @ApiParam("返回信息") @@ -187,7 +187,7 @@ public class MesProduceSn extends BaseBean implements Serializable { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", snType=" + snType + - ", tray='" + tray + '\'' + + ", trayNo='" + trayNo + '\'' + ", resultMsg='" + resultMsg + '\'' + ", operateType=" + operateType + ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + 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 index d25f92d..89717dc 100644 --- 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 @@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; 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 index 9fc108a..4232d0d 100644 --- 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 @@ -76,7 +76,7 @@ public class MesHqlPack { public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); +// DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); return packBean; } 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 02de63d..824d9a8 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 @@ -117,9 +117,9 @@ public class MesProduceSn extends BaseBean { @ApiParam("条码类型") private Integer snType; - @Column(name = "TRAY") + @Column(name = "TRAY_NO") @ApiParam("托盘号") - private String tray; + private String trayNo; @Column(name="OPERATE_TYPE") @ApiParam("操作类型") @@ -184,7 +184,7 @@ public class MesProduceSn extends BaseBean { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", snType=" + snType + - ", tray='" + tray + '\'' + + ", trayNo='" + trayNo + '\'' + ", operateType=" + operateType + ", resultMsg='" + resultMsg + '\'' + '}'; 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 40c70b2..dd0909a 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 @@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; From 68bba613e3972981db07a10dd51f2259739a086c Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 9 Dec 2019 20:35:29 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 12 ------------ .../java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java | 2 -- 2 files changed, 14 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index e032535..52363f2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -15,7 +14,6 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.MappedSuperclass; import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; import java.util.Date; import java.util.List; @@ -105,14 +103,4 @@ public class BaseOrder extends BaseCode { public List getPostRelations() { return BeanRelation.list(this, EBaseOrder.PostRelations); } - - @JsonBackReference - public List getUpperOrders() { - return BeanRelation.list(this, EBaseOrder.UpperOrders); - } - - @JsonBackReference - public List getLowerOrders() { - return BeanRelation.list(this, EBaseOrder.LowerOrders); - } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index e4c5238..28e4b51 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -5,6 +5,4 @@ public enum EBaseOrder { Material, PrevRelations, PostRelations, - UpperOrders, - LowerOrders } From f5181072b5702c5d519274023e6a33da4459a024 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 9 Dec 2019 20:48:39 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java | 62 ---------------------- .../pojo/mes/pcn/repository/MesESOPRepository.java | 17 ------ .../cn/estsh/i3plus/pojo/mes/bean/MesESOP.java | 62 ---------------------- .../pojo/mes/repository/MesESOPRepository.java | 17 ------ 4 files changed, 158 deletions(-) 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/repository/MesESOPRepository.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java 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 548ed5d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.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; - -/** - * @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 { - - @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; - -} 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 9f76128..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/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 deleted file mode 100644 index 0ea3263..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java +++ /dev/null @@ -1,62 +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.Table; - -/** - * @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 { - - @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; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java deleted file mode 100644 index 367ef81..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java +++ /dev/null @@ -1,17 +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.MesActionMethod; -import cn.estsh.i3plus.pojo.mes.bean.MesESOP; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesESOPRepository extends BaseRepository { -}