From 724ba402bf2fea70b3be097df51df7e92f2bbae3 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 23 Apr 2020 19:41:58 +0800 Subject: [PATCH 001/134] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index b9e6a01..dc166c4 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 @@ -2877,6 +2877,39 @@ public class WmsHqlPack { } /** + * 库区物料信息分页查询条件 + * + * @param itemCheck + * @return + */ + public static DdlPackBean packHqlWmsPartItemCheck(WmsPartItemCheck itemCheck) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(itemCheck.getPartNo(), "partNo", result); + + getStringBuilderPack(itemCheck, result); + + return result; + } + + /** + * BH子检测项分页查询条件 + * + * @param item + * @return + */ + public static DdlPackBean packHqlWmsBhChildDetectionItem(WmsBhChildDetectionItem item) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(item.getItemCheckCode(), "itemCheckCode", result); + DdlPreparedPack.getStringLikerPack(item.getItemCheckName(), "itemCheckName", result); + + getStringBuilderPack(item, result); + + return result; + } + + /** * 根据条件查询dataAuth * * @param wmsSnOperateRecord From 633aef2d6e99061f6b2b6dfe4cb72afec74a0fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 24 Apr 2020 13:49:51 +0800 Subject: [PATCH 002/134] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=BC=80=E7=AA=97=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index a2420d6..6506c66 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -82,8 +82,8 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", + listColumnName = "name", explicitColumnName = "name") public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @@ -95,8 +95,8 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", + listColumnName = "name", explicitColumnName = "name") public String modifyUser; @Column(name="MODIFY_DATE_TIME") From 64daf3641002433cb58647f67ee248401b3bd343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 24 Apr 2020 13:54:59 +0800 Subject: [PATCH 003/134] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=BC=80=E7=AA=97=E5=A4=84=E7=90=86,BUG:8097?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index a2420d6..6506c66 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -82,8 +82,8 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", + listColumnName = "name", explicitColumnName = "name") public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @@ -95,8 +95,8 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", + listColumnName = "name", explicitColumnName = "name") public String modifyUser; @Column(name="MODIFY_DATE_TIME") From 92c13e5bcd98d5719a125886595ae3cb10625c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 24 Apr 2020 15:54:30 +0800 Subject: [PATCH 004/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=8A=80=E8=83=BD=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/mes/bean/MesShiftClassDetail.java | 4 ++++ 1 file changed, 4 insertions(+) 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 e172b88f..bd588d7 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 @@ -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; /** @@ -50,4 +51,7 @@ public class MesShiftClassDetail extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; + @Transient + @ApiParam("开始-结束日期") + private String startEndTime; } From 8e529f46d7ae82dc0b82d102748a94b677552030 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 24 Apr 2020 19:55:53 +0800 Subject: [PATCH 005/134] =?UTF-8?q?=E3=80=901722=20BH-Bacth=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 30 ++++++++++++++- .../i3plus/pojo/wms/bean/WmsTestResultDetails.java | 4 ++ .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 1 + .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 44 ++++++++++++++++++++-- 4 files changed, 74 insertions(+), 5 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 c9fdc27..314f299 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 @@ -12,7 +12,11 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; @@ -501,4 +505,28 @@ public class WmsStockSn extends BaseBean { this.modifyUser = modifyUser; } + public WmsStockSn(String organizeCode, String refSrc, String partNo, String partNameRdd, Integer snType, + String locateNo, String workCenterCode, String packageNo, String shippingFlag, String lotNo, String dateCode, String fixLotNo + , String leftCode, Double qty, String sn, String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.refSrc = refSrc; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snType = snType; + this.locateNo = locateNo; + this.workCenterCode = workCenterCode; + this.packageNo = packageNo; + this.shippingFlag = shippingFlag; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.fixLotNo = fixLotNo; + this.leftCode = leftCode; + this.qty = qty; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } + } 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 28445f7..5329861 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.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; @@ -47,6 +49,7 @@ public class WmsTestResultDetails extends BaseBean { @Column(name = "CHECK_TYPE") @ApiParam("大检测项类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_CHECK_TYPE.class, refForeignKey = "value", value = "description") public Integer checkType; @Column(name = "qr_code") @@ -55,6 +58,7 @@ public class WmsTestResultDetails extends BaseBean { @Column(name = "is_qualified") @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isQualified; @Column(name = "check_value") 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 08d6631..c928e2b 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 @@ -55,6 +55,7 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "IS_QUALIFIED") @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isQualified; @Column(name = "REWORK_STATUS") 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 b62c8c8..9b21eb1 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 @@ -3127,12 +3127,48 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result); DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkResult(), "reworkStatus", result); DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result); - DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(), - wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true); - DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(), - wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true); + if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(), + wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true); + } + + if (StringUtils.isNotBlank(wmsTestResultSummary.getModifyDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(), + wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true); + } getStringBuilderPack(wmsTestResultSummary, result); return result; } + + /** + * 检测结果明细表 分页查询 + * + * @param wmsTestResultDetails + * @return + */ + public static DdlPackBean packHqWmsTestResultDetails(WmsTestResultDetails wmsTestResultDetails) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result); + if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsTestResultDetails.getCreateDateTimeStart(), + wmsTestResultDetails.getCreateDateTimeEnd(), "createDatetime", result, true); + } + + if (StringUtils.isNotBlank(wmsTestResultDetails.getModifyDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsTestResultDetails.getModifyDateTimeStart(), + wmsTestResultDetails.getModifyDateTimeEnd(), "modifyDateTime", result, true); + } + + + getStringBuilderPack(wmsTestResultDetails, result); + + return result; + } } From d5f69eeefd2e12411163f94e922496a595451992 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sat, 25 Apr 2020 11:22:51 +0800 Subject: [PATCH 006/134] =?UTF-8?q?task=201565=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=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 | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 --- 2 files changed, 2 insertions(+), 5 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 b7d0c56..900dbb7 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 @@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SHIPPING_ACTUAL_STATUS { CREATE(10, "创建"), - CANCEL(20, "已发运"); + SHIPPED(20, "已发运"); private int value; private String description; @@ -3338,7 +3338,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FSM_STATE_TYPE { BEGIN(10, "begin", "开始状态点"), - END(20, "end", "结束状态点"); + END(40, "end", "结束状态点"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 7bd7307..78826ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -132,9 +132,6 @@ public class StationRequestBean implements Serializable { @ApiParam("客户工厂代码") private String customerFactoryCode; - @ApiParam("发运命令") - private String shippingCmd; - @Override public String toString() { return "StationRequestBean{" + From 2b01efb15b184ab6206f11536786e538c3a3709c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 25 Apr 2020 17:45:01 +0800 Subject: [PATCH 007/134] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 106 ++++++++++++--------- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 24 +++++ 2 files changed, 85 insertions(+), 45 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 c653f59..686e6eb 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 @@ -1798,55 +1798,58 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_INSERT_EXCEL { - MES_PLAN_ORDER(10, "生产计划"), - MES_EQUIPMENT(20, "设备台账"), - MES_EQU_TASK_STANDARD(30, "设备作业要求"), - MES_CUST_ORDER(40, "客户订单"), - MES_PCN_SYNC_CFG(50, "PCN同步配置"), - MES_PART(60, "物料表"), - MES_PRODUCE_CATEGORY(70, "产品类型"), - MES_PACK_SPEC(80, "包装规格"), - MES_PROD_PACK(90, "产品包装关系"), - MES_PRODUCT_ENCODE_CFG(100, "产品编码配置"), - MES_BOM(110, "物料清单"), - MES_PROD_CFG_TYPE(120, "产品配置类型"), - MES_CUSTOMER(130, "客户表"), - MES_CUSTOMER_PART(140, "客户零件关系表"), - MES_WORK_CENTER(150, "生产线"), - MES_WORK_CELL(160, "工位"), - MES_WC_EQUIPMENT(170, "工位设备关系表"), - MES_SHIFT(180, "班次"), - MES_SHIFT_GROUP(190, "班组"), - MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"), - MES_STATION_BOM(210, "工位BOM表"), - MES_DATA_OBJECT(220, "数据对象"), - MES_OBJECT_CFG(230, "对象结构"), - MES_WC_CHECK(240, "开线检查"), - MES_QC_CHECK_STANDARD(250, "质量检测标准"), - MES_FAULT_CAUSE(260, "设备故障原因"), - MES_FAULT_METHOD(270, "设备故障处理措施"), - MES_FAULT_PHENOMENON(280, "设备故障现象"), - MES_DEFECT(290, "缺陷"), - MES_DEFECT_CAUSE(300, "缺陷原因"), - MES_SCRAP(310, "报废原因"), - MES_REPAIR(320, "质量数据处理措施"), - MES_EQU_TASK_PLAN(330, "设备作业周期计划"), - MES_PART_OJBECT(340, "物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), - MES_DATASOURCE(360, "DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"), - MES_PLC(390, "PLC地址清单"), - MES_PROCESS(400, "工序信息"), - MES_KPSN_RULE(410, "关键件条码校验规则"), - MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"), - MES_PART_BOM_IMPORT(430, "散件BOM导入"); + MES_PLAN_ORDER(10, "planOrderExcelImportService", "生产计划"), + MES_EQUIPMENT(20, "equipmentExcelImportService", "设备台账，支持编辑"), + MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelImportService", "设备作业要求，支持编辑"), + MES_CUST_ORDER(40, "custOrderExcelImportService", "客户订单"), + MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelImportService", "PCN同步配置"), + MES_PART(60, "partExcelImportService", "物料表，支持编辑"), + MES_PRODUCE_CATEGORY(70, "produceCategoryExcelImportService", "产品类型"), + MES_PACK_SPEC(80, "packSpecExcelImportService", "包装规格，支持编辑"), + MES_PROD_PACK(90, "prodPackExcelImportService", "产品包装关系"), + MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelImportService", "产品编码配置"), + MES_BOM(110, "bomExcelImportService", "物料清单，支持编辑"), + MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelImportService", "产品配置类型"), + MES_CUSTOMER(130, "customerExcelImportService", "客户表，支持编辑"), + MES_CUSTOMER_PART(140, "customerPartExcelImportService", "客户零件关系表，支持编辑"), + MES_WORK_CENTER(150, "workCenterExcelImportService", "生产线，支持编辑"), + MES_WORK_CELL(160, "workCellExcelImportService", "工位，支持编辑"), + MES_WC_EQUIPMENT(170, "wcEquipmentExcelImportService", "工位设备关系表"), + MES_SHIFT(180, "shiftExcelImportService", "班次，支持编辑"), + MES_SHIFT_GROUP(190, "shiftGroupExcelImportService", "班组，支持编辑"), + MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelImportService", "工作单元参数配置"), + MES_STATION_BOM(210, "stationBomExcelImportService", "工位BOM表"), + MES_DATA_OBJECT(220, "dataObjectExcelImportService", "数据对象"), + MES_OBJECT_CFG(230, "objectCfgExcelImportService", "对象结构"), + MES_WC_CHECK(240, "wcCheckExcelImportService", "开线检查，支持编辑"), + MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelImportService", "质量检测标准，支持编辑"), + MES_FAULT_CAUSE(260, "faultCauseExcelImportService", "设备故障原因，支持编辑"), + MES_FAULT_METHOD(270, "faultMethodExcelImportService", "设备故障处理措施，支持编辑"), + MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelImportService", "设备故障现象，支持编辑"), + MES_DEFECT(290, "defectExcelImportService", "缺陷，支持编辑"), + MES_DEFECT_CAUSE(300, "defectCauseExcelImportService", "缺陷原因，支持编辑"), + MES_SCRAP(310, "scrapExcelImportService", "报废原因，支持编辑"), + MES_REPAIR(320, "repairExcelImportService", "质量数据处理措施，支持编辑"), + MES_EQU_TASK_PLAN(330, "equTaskPlanExcelImportService", "设备作业周期计划，支持编辑"), + MES_PART_OJBECT(340, "partObjectExcelImportService", "物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelImportService", "工序工作单元"), + MES_DATASOURCE(360, "datasourceExcelImportService", "DB地址清单"), + MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelImportService", "设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelImportService", "设备通知对象"), + MES_PLC(390, "plcExcelImportService", "PLC地址清单，支持编辑"), + MES_PROCESS(400, "processExcelImportService", "工序信息"), + MES_KPSN_RULE(410, "kpsnRuleExcelImportService", "关键件条码校验规则，支持编辑"), + MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelImportService", "客户JIT生产队列"), + MES_PART_BOM_IMPORT(430, "partBomExcelImportService", "散件BOM导入"), + MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制"); private int value; + private String service; private String description; - MES_INSERT_EXCEL(int value, String description) { + MES_INSERT_EXCEL(int value, String service, String description) { this.value = value; + this.service = service; this.description = description; } @@ -1854,6 +1857,10 @@ public class MesEnumUtil { return value; } + public String getService() { + return service; + } + public String getDescription() { return description; } @@ -1867,7 +1874,6 @@ public class MesEnumUtil { return null; } - public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -1878,6 +1884,16 @@ public class MesEnumUtil { return tmp; } + public static String valueOfService(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].service; + } + } + return tmp; + } + } /** 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 80b4a21..617cbd0 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 @@ -153,6 +153,26 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; + @Column(name = "RESERVED1") + @ApiParam("预留字段1") + private String reserved1; + + @Column(name = "RESERVED2") + @ApiParam("预留字段2") + private String reserved2; + + @Column(name = "RESERVED3") + @ApiParam("预留字段13") + private String reserved3; + + @Column(name = "RESERVED4") + @ApiParam("预留字段14") + private String reserved4; + + @Column(name = "RESERVED5") + @ApiParam("预留字段5") + private String reserved5; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") @@ -248,6 +268,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("工单状态描述") private String workOrderStatusDesc; + @Transient + @ApiParam("计划类型") + private Integer planType; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 71d30c3232e5e2a066b679bc050b10215aaa8de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 26 Apr 2020 09:56:29 +0800 Subject: [PATCH 008/134] =?UTF-8?q?=E8=A1=A8=E5=8D=95-=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=8C=89=E9=92=AE-=E6=B7=BB=E5=8A=A0=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=9C=80=E8=A6=81=E9=80=89=E4=B8=AD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8F=8A=E5=AE=9E=E7=8E=B0Http=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E6=89=A9=E5=B1=95=20=E8=A1=A8=E5=8D=95-=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=99=A8-=E5=AE=9E=E7=8E=B0Http=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E6=89=A9=E5=B1=95=20=E8=A1=A8=E5=8D=95-=E5=85=83=E7=B4=A0-?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=95=B0=E6=8D=AE=E9=9A=94=E7=A6=BB=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=E8=A1=A8=E5=8D=95-=E5=8A=A8=E6=80=81=E8=A1=A8?= =?UTF-8?q?=E5=8D=95-=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=85=88=E7=BA=A7=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20sonar=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 83 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/form/bean/BfButton.java | 11 ++- .../pojo/form/bean/BfDataObjectProperty.java | 5 ++ .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 17 +++++ 4 files changed, 113 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 00e30d0..241e028 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -985,6 +985,89 @@ public class BlockFormEnumUtil { } + + /** + * 元素组织隔离 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_ORGANIZE_ISOLATION_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"); + + private int value; + private String code; + private String description; + + private ELEMENT_ORGANIZE_ISOLATION_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 valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(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; + } + + 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 ELEMENT_ORGANIZE_ISOLATION_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + 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; + } + } + + /** * 属性字段排序规则 */ diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index 04ac36a..f350e27 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -46,9 +46,14 @@ public class BfButton extends BaseBean { } } - @Column(name = "IS_REQUIRED_DATA") - @ApiParam(value = "是必填数据") - private Integer isRequiredData; + @Column(name = "IS_NEED_SELECT_DATA") + @ApiParam(value = "是否需要选中数据") + private Integer isNeedSelectData; + + @Column(name = "IS_REFRESH") + @ApiParam(value = "是否刷新") + private Integer isRefresh; + // 关联表单功能表id @Column(name = "METHOD_ID") 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 6ea46e8..c5d2d9a 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; @@ -66,6 +67,10 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value = "是否允许为空") private Integer isNullable; + public Integer getIsNullableVal(){ + return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue(); + } + // 字段长度 @ApiParam(value = "字段长度") @Column(name="OBJECT_COLUMN_PRECISION") 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 96c8901..549d365 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -82,6 +83,10 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否弱删除") private Integer isObjectDelWeak; + public Integer getIsObjectDelWeakVal(){ + return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue(); + } + @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID") @ApiParam(value = "元素弱删除属性id") private Long elementDelWeakAttrId; @@ -90,10 +95,22 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否有效") private Integer isObjectValid; + public Integer getIsObjectValidVal(){ + return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue(); + } + @Column(name = "ELEMENT_VALID_ATTR_ID") @ApiParam(value = "元素有效属性id") private Long elementValidAttrId; + @Column(name = "IS_ORGANIZE_ISOLATION") + @ApiParam(value = "是否组织隔离") + private Integer isOrganizeIsolation; + + public Integer getIsOrganizeIsolationVal(){ + return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue(); + } + @Column(name = "IS_OBJECT_EXPORT") @ApiParam(value = "是否导出") private Integer isObjectExport; From 241ea78cda97117d6328007921ebc9d0e8de1e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 26 Apr 2020 09:58:20 +0800 Subject: [PATCH 009/134] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= 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, 2 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 7dfb083..2b86455 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 @@ -1968,8 +1968,8 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ACTUATOR_ENV_PATH { - PID(1,"PID" ,"PID"), - JAVA_VERSION(2, "java.version","jdk版本"); + PID(1,"/PID" ,"PID"), + JAVA_VERSION(2, "/java.version","jdk版本"); private int value; private String path; From 3cd2fb02f406a4b0be1ffc0928a5af4a1d8ae2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 26 Apr 2020 10:08:33 +0800 Subject: [PATCH 010/134] =?UTF-8?q?=E5=AE=81=E5=BE=B7BUG-JIS=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E6=B1=87=E6=80=BBJOB:BUG#8246?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsFGInStock.java | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) 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 89184cf..e61c8f7 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 @@ -25,79 +25,79 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_FG_INSTOCK") +@Table(name = "WMS_DOC_FG_INSTOCK") @Api("产品入库信息") public class WmsFGInStock extends BaseBean { private static final long serialVersionUID = 5337952801731230326L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("订单号") public String orderNo; - @Column(name="WO_NO") + @Column(name = "WO_NO") @ApiParam("ERP工单号") public String woNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") public String unit; - @Column(name="SN") + @Column(name = "SN") @ApiParam("条码") public String sn; /** * 状态：1=新建,10=已处理,20=处理出错 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") public Integer orderStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String remark; /** * 来源：MNU=手工,MES=MES接口 */ - @Column(name="SRC") + @Column(name = "SRC") @ApiParam("单据来源") public String src; - @Column(name="ERP_AREA_NO") + @Column(name = "ERP_AREA_NO") @ApiParam("默认收货库存地") public String erpAreaNo; - @Column(name="LINE_NO") + @Column(name = "LINE_NO") @ApiParam("生产线") public String lineNo; - @Column(name="WH_NO") + @Column(name = "WH_NO") @ApiParam("默认仓库") public String whNo; - @Column(name="CUST_NO") + @Column(name = "CUST_NO") @ApiParam("客户编码") public String custNo; - @Column(name="SHIPPING_FLAG") + @Column(name = "SHIPPING_FLAG") @ApiParam("特殊发货标志") public String shippingFlag; - @Column(name="MFG_LOG_NO") + @Column(name = "MFG_LOG_NO") @ApiParam("生产批次") public String mfgLogNo; } From d4a91b6d691e2a6f3c71e10c0dae721be0be4005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 26 Apr 2020 10:33:19 +0800 Subject: [PATCH 011/134] =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=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/platform/sqlpack/CoreHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 9ac4829..839d22a 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 @@ -339,6 +339,7 @@ public class CoreHqlPack { } DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result); + DdlPreparedPack.getStringLikerPack(dictionary.getParentNameRdd(), "parentNameRdd", result); DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryValue(), "dictionaryValue", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); From a8ae48b1328b48ec4aabc6bb8d4910c22a061200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 26 Apr 2020 10:38:52 +0800 Subject: [PATCH 012/134] =?UTF-8?q?=E3=80=907937=20=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E7=AE=B1=E6=9D=A1=E7=A0=81=E7=BB=91=E5=AE=9A=E5=B7=A5?= =?UTF-8?q?=E6=AD=A5-=E6=95=B0=E6=8D=AE=E5=86=99=E5=85=A5=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=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/pcn/bean/IfPackageDetail.java | 4 ++++ 1 file changed, 4 insertions(+) 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 index 5e7684b..651f8dc 100644 --- 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 @@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; } From ff6e5ac92657ccbffebe70069cffae4d700721ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 26 Apr 2020 15:20:46 +0800 Subject: [PATCH 013/134] =?UTF-8?q?=E3=80=908239=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A-=E5=8D=95=E4=BA=A7=E5=93=81=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=EF=BC=88=E6=95=B0=E6=8D=AE=E5=86=99=E5=85=A5=E6=9C=89?= =?UTF-8?q?=E8=AF=AF=EF=BC=89=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/IfPackageDetail.java | 4 ++++ 1 file changed, 4 insertions(+) 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 d08568e..0549d1f 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 @@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; } From f414274aeb3fdbb40b211c542c74ed0a89106b89 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 26 Apr 2020 15:31:12 +0800 Subject: [PATCH 014/134] =?UTF-8?q?=E4=BE=9B=E8=B4=A7=E8=BF=BD=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 ebf9603..b077ae5 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 @@ -41,6 +41,10 @@ public class BasVendor extends BaseBean{ @ApiParam("供应商全称") private String vendorDesc; + @Column(name = "USER_NAME") + @ApiParam("用户名") + private String userName; + @Column(name="VENDOR_ADDR") @ApiParam("供应商地址") private String vendorAddr; @@ -57,10 +61,6 @@ public class BasVendor extends BaseBean{ @ApiParam(value = "是否发ASN", example = "0") private Integer isAsn; - @Column(name = "USER_NAME") - @ApiParam(value = "用户名") - private String userName; - @Column(name = "PASSWORD") @ApiParam(value = "密码") private String password; From 60428b5bad72f92b0b7fa1b847017a3b25cf563c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 26 Apr 2020 15:38:36 +0800 Subject: [PATCH 015/134] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1690=20?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=AA=97=E5=8F=A3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 34 ++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWindow.java | 53 ++++++++++++++++++++++ .../pojo/mes/repository/MesWindowRepository.java | 15 ++++++ 3 files changed, 102 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 686e6eb..2db6016 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 @@ -5139,5 +5139,39 @@ public class MesEnumUtil { } } + /** + * 界面类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WINDOW_TYPE { + BUTTON_CFG(10, "按钮组件"), + BOARD_BASE_WINDOW(20, "看板基础页面"); + + private int value; + private String description; + + WINDOW_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; + } + } } 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 new file mode 100644 index 0000000..68b7ee0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindow.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/26 11:43 上午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WINDOW") +@Api("MES_看板界面") +public class MesWindow extends BaseBean implements Serializable { + + private static final long serialVersionUID = -55209393692924780L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面编号") + private String windowNo; + + @Column(name = "WINDOW_NAME") + @ApiParam("界面名称") + private String windowName; + + @Column(name = "WINDOW_TYPE") + @ApiParam("界面类型") + private Integer windowType; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Transient + @ApiParam("顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.java new file mode 100644 index 0000000..6ac1635 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowRepository.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.MesWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/26 11:48 上午 + * @Modify: + */ +@Repository +public interface MesWindowRepository extends BaseRepository { +} From 81f380aec43e91390c1fe1009c421e9fc3c7db3b Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 26 Apr 2020 18:22:45 +0800 Subject: [PATCH 016/134] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 47 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsFGInStock.java | 15 +++++++ 2 files changed, 62 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 a4a7078..edb5b35 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 @@ -6506,4 +6506,51 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * BatchHold 值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FG_INSTOCK_SN_TYPE { + NORMAL(10, "NORMAL", "实物条码(正常)"), + FIRST_PIECE(20, "FIRST_PIECE", "首件"), + MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"), + TAIL_PIECE(40, "TAIL_PIECE", "末件"); + + private int value; + private String code; + private String description; + + FG_INSTOCK_SN_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/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 89184cf..2a4d16b 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 @@ -100,4 +100,19 @@ public class WmsFGInStock extends BaseBean { @Column(name="MFG_LOG_NO") @ApiParam("生产批次") public String mfgLogNo; + + @Column(name = "BATCH_NO") + @ApiParam("batch号") + private String batchNo; + + @Column(name = "PACKAGE_NO") + @ApiParam("箱条码") + private String packageNo; + + /** + * 条码类型：10=实物条码(正常),20=首件,30=中件,40=末件 + */ + @Column(name = "SN_TYPE") + @ApiParam("条码类型") + private Integer snType; } From b9af2c52f86d677a43c1ef9c24bcd56428516520 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 26 Apr 2020 19:07:13 +0800 Subject: [PATCH 017/134] =?UTF-8?q?1713=20BH-=E6=8C=91=E9=80=89=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E4=BF=AE?= 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 57e81fc..8c1856a 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 @@ -6563,4 +6563,5 @@ public class WmsEnumUtil { return valueOf(val); } } + } From 745455c5bd4ca733f78c5e500771d38fb7ae688c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sun, 26 Apr 2020 20:19:13 +0800 Subject: [PATCH 018/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A2=E6=AC=A1?= =?UTF-8?q?=E8=A7=84=E5=88=99bug=E5=92=8C=E5=AF=B9=E6=8E=A5=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=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/base/bean/BaseBean.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 6506c66..249411a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -82,8 +82,7 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @@ -95,8 +94,7 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String modifyUser; @Column(name="MODIFY_DATE_TIME") From be925fded9083e6a7cd2ec943f39925a0f14d96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 27 Apr 2020 09:37:50 +0800 Subject: [PATCH 019/134] =?UTF-8?q?=E3=80=901693-=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesBoardEquDetail.java | 36 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesBoardEquStatus.java | 4 --- 2 files changed, 36 insertions(+), 4 deletions(-) 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 8dcd494..16462e9 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +12,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; /** @@ -49,4 +51,38 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @Column(name = "Y_AXES") @ApiParam(value = "纵坐标") private Double yAxes = 0d; + + @Transient + @ApiParam("设备状态") + private Integer equStatus; + + @Transient + @ApiParam("颜色") + private String color; + + @JsonProperty("xAxes") + public Double getxAxes() { + return xAxes; + } + + public void setxAxes(Double xAxes) { + this.xAxes = xAxes; + } + + @JsonProperty("yAxes") + public Double getyAxes() { + return yAxes; + } + + public void setyAxes(Double yAxes) { + this.yAxes = yAxes; + } + + public double getXAxes() { + return this.xAxes == null ? 0.0d : this.xAxes; + } + + public double getYAxes() { + return this.yAxes == null ? 0.0d : this.yAxes; + } } 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 9efed7a..a4f9a61 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 @@ -34,10 +34,6 @@ public class MesBoardEquStatus extends BaseBean implements Serializable { @ApiParam("看板代码") private String boardCode; - @Column(name = "EQU_CODE") - @ApiParam("设备代码") - private String equCode; - @Column(name = "EQU_STATUS_CODE") @ApiParam("状态代码") private Integer equStatusCode; From de7d007ef1ca974e424ef91ca6e19384daf9152a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 27 Apr 2020 14:27:34 +0800 Subject: [PATCH 020/134] =?UTF-8?q?[=E8=8E=B7=E5=8F=96=E5=B7=A5=E6=AD=A5sq?= =?UTF-8?q?l=20server=E5=88=86=E7=BB=84=E5=87=BD=E6=95=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java index 4a8aec6..a4b29ec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -43,6 +43,13 @@ public class ButtonDynamicModel { this.buttonName = buttonName; } + + public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){ + this.buttonCode = buttonCode; + this.buttonName = buttonName; + this.paramCode = paramCode; + } + public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){ this.id = id; this.buttonCode = buttonCode; From 7aaed8fb79bd92428cc0eb4bcd17fac79f9a0c3d Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 27 Apr 2020 18:15:39 +0800 Subject: [PATCH 021/134] task:1735 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.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/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 1b4a3ab..66d6249 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 @@ -71,7 +71,7 @@ public class WmsFGInStock extends BaseBean { public String remark; /** - * 来源：MNU=手工,MES=MES接口 + * 来源：BH:BatchHold,MNU=手工,MES=MES接口 */ @Column(name = "SRC") @ApiParam("单据来源") From cf12f354ae87a5ce64ef0ce382e862f2ee48cad7 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 27 Apr 2020 21:55:55 +0800 Subject: [PATCH 022/134] =?UTF-8?q?[8206=20=E7=94=9F=E4=BA=A7=E5=B7=A5?= =?UTF-8?q?=E5=8D=95-=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java index d7ca7a5..b7a7eef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -16,23 +16,28 @@ import lombok.Data; @Api(value="生产工单导入",description = "生产工单导入") public class MesWorkOrderModel { - @ApiParam("工单号") + //工单号 + @ApiParam("OrderCode") @AnnoOutputColumn private String orderNo; - @ApiParam("物料号") + //物料号 + @ApiParam("ItemCode") @AnnoOutputColumn private String partNo; - @ApiParam("客户产线代码") + //客户产线代码 + @ApiParam("ProductionLineID") @AnnoOutputColumn private String custProdLineCode; - @ApiParam("数量") + //数量 + @ApiParam("DemandQty") @AnnoOutputColumn private Double qty; - @ApiParam("开始时间") + //开始时间 + @ApiParam("ProductDate") @AnnoOutputColumn private String startTime; From fb15536a347bf512fc8bc0ef07cf9f15f7a57c24 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 28 Apr 2020 10:22:29 +0800 Subject: [PATCH 023/134] =?UTF-8?q?=E3=80=908254=20=E4=B8=AD=E8=88=AA-?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95-=E5=AE=A2=E6=88=B7=E5=8F=91?= =?UTF-8?q?=E8=BF=90-=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=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/WmsDocSoDetails.java | 5 +++++ 1 file changed, 5 insertions(+) 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 20e8f31..32ce767 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 @@ -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; /** * @Description : 销售订单明细表 @@ -67,4 +68,8 @@ public class WmsDocSoDetails extends BaseBean { @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; + + @Transient + @ApiParam(value = "客户编号") + private String custCode; } From da1c10dc4cc2a827da1337d1a7ddb6a1b17de41e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 28 Apr 2020 11:10:59 +0800 Subject: [PATCH 024/134] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 16 +---- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 20 ++++++ .../mes/model/ProdPlanBatchCompileDetailModel.java | 33 +++++++++ .../pojo/mes/model/ProdPlanBatchCompileModel.java | 78 ++++++++++++++++++++++ 5 files changed, 134 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 2db6016..db6edcf 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 @@ -1841,7 +1841,7 @@ public class MesEnumUtil { MES_KPSN_RULE(410, "kpsnRuleExcelImportService", "关键件条码校验规则，支持编辑"), MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelImportService", "客户JIT生产队列"), MES_PART_BOM_IMPORT(430, "partBomExcelImportService", "散件BOM导入"), - MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制"); + MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制，支持编辑"); private int value; private String service; 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 617cbd0..6a70107 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 @@ -162,11 +162,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { private String reserved2; @Column(name = "RESERVED3") - @ApiParam("预留字段13") + @ApiParam("预留字段3") private String reserved3; @Column(name = "RESERVED4") - @ApiParam("预留字段14") + @ApiParam("预留字段4") private String reserved4; @Column(name = "RESERVED5") @@ -178,18 +178,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; - @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; - /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") 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 6366551..ac78dd7 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 @@ -151,6 +151,26 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; + @Column(name = "RESERVED1") + @ApiParam("预留字段1") + private String reserved1; + + @Column(name = "RESERVED2") + @ApiParam("预留字段2") + private String reserved2; + + @Column(name = "RESERVED3") + @ApiParam("预留字段3") + private String reserved3; + + @Column(name = "RESERVED4") + @ApiParam("预留字段4") + private String reserved4; + + @Column(name = "RESERVED5") + @ApiParam("预留字段5") + private String reserved5; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java new file mode 100644 index 0000000..f16fc84 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 生产计划批量编制明细model + * @Author: wangjie + * @Date: 2020/4/21 6:55 下午 + * @Modify: + */ +@Data +public class ProdPlanBatchCompileDetailModel { + + @ApiParam("日期") + private String date; + + @ApiParam("日期对应到数量") + private Double qty; + + @ApiParam("是否只读") + private Boolean readonly; + + @ApiParam("完成数量") + private Double completeQty; + + @ApiParam("完成数量的颜色") + private String color; + + @ApiParam("工单号") + private String orderNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java new file mode 100644 index 0000000..f82a656 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 生产计划批量编制model + * @Author: wangjie + * @Date: 2020/4/21 6:55 下午 + * @Modify: + */ +@Data +public class ProdPlanBatchCompileModel { + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("预留字段1") + private String reserved1; + + @ApiParam("预留字段2") + private String reserved2; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam(value = "班组名称") + public String shiftGroupName; + + @ApiParam(value = "班次名称") + public String shiftName; + + @ApiParam("班组") + private String shiftGroup; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("客户名称") + private String custCodeName; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户订单号") + private String custOrderNo; + + @ApiParam("预留字段3") + private String reserved3; + + @ApiParam("预留字段4") + private String reserved4; + + @ApiParam("单位") + private String unit; + + @ApiParam("日期数量集合") + private List detailList; + + @ApiParam("合计") + private Double amount; + + @ApiParam("完成合计") + private Double completeAmount; + + @ApiParam("计划类型") + private Integer planType; + + @ApiParam("计划类型名称") + private String planTypeName; + +} From a575b4eed4e3bbdd181779b74babe779b8d05e4f Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 28 Apr 2020 13:17:12 +0800 Subject: [PATCH 025/134] bug:8287;8288;8290 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 57e81fc..ce953ae 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 @@ -5720,8 +5720,7 @@ public class WmsEnumUtil { public enum DOCK_ORDER_STATUS { WAIT_SEND(10, "待送货"), ARRIVED(20, "已到达"), - RECEIVED(30, "已收货"), - CANCELED(40, "已取消"); + CANCELED(30, "已取消"); private int value; private String description; From 97d7fdbf24140a312d5a0fea0cacd5fe7586b485 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 28 Apr 2020 13:44:05 +0800 Subject: [PATCH 026/134] =?UTF-8?q?=E3=80=908181=2020011--=20=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=89=93=E5=8D=B0=E7=BB=84=E5=8F=B7=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E7=94=A8=E4=BA=8E=E7=8E=B0=E5=9C=BA=E6=AF=8D?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=A2=E5=A4=B1=E6=88=96=E8=80=85=E6=8D=9F?= =?UTF-8?q?=E5=9D=8F=E7=9A=84=E5=9C=BA=E6=99=AF=E6=9D=A5=E8=A1=A5=E6=89=93?= =?UTF-8?q?=E6=AF=8D=E6=9D=A1=E7=A0=81=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 | 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 9b21eb1..cbe0f2c 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 @@ -1663,7 +1663,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); From de200de372040092a828f391ce8513c6711602c1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 28 Apr 2020 17:59:17 +0800 Subject: [PATCH 027/134] mes --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 102 ++++++++++----------- .../i3plus/pojo/model/common/ExportDataModel.java | 4 + 2 files changed, 55 insertions(+), 51 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 db6edcf..e126301 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 @@ -1796,58 +1796,58 @@ public class MesEnumUtil { * mes导入模块 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_INSERT_EXCEL { - - MES_PLAN_ORDER(10, "planOrderExcelImportService", "生产计划"), - MES_EQUIPMENT(20, "equipmentExcelImportService", "设备台账，支持编辑"), - MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelImportService", "设备作业要求，支持编辑"), - MES_CUST_ORDER(40, "custOrderExcelImportService", "客户订单"), - MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelImportService", "PCN同步配置"), - MES_PART(60, "partExcelImportService", "物料表，支持编辑"), - MES_PRODUCE_CATEGORY(70, "produceCategoryExcelImportService", "产品类型"), - MES_PACK_SPEC(80, "packSpecExcelImportService", "包装规格，支持编辑"), - MES_PROD_PACK(90, "prodPackExcelImportService", "产品包装关系"), - MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelImportService", "产品编码配置"), - MES_BOM(110, "bomExcelImportService", "物料清单，支持编辑"), - MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelImportService", "产品配置类型"), - MES_CUSTOMER(130, "customerExcelImportService", "客户表，支持编辑"), - MES_CUSTOMER_PART(140, "customerPartExcelImportService", "客户零件关系表，支持编辑"), - MES_WORK_CENTER(150, "workCenterExcelImportService", "生产线，支持编辑"), - MES_WORK_CELL(160, "workCellExcelImportService", "工位，支持编辑"), - MES_WC_EQUIPMENT(170, "wcEquipmentExcelImportService", "工位设备关系表"), - MES_SHIFT(180, "shiftExcelImportService", "班次，支持编辑"), - MES_SHIFT_GROUP(190, "shiftGroupExcelImportService", "班组，支持编辑"), - MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelImportService", "工作单元参数配置"), - MES_STATION_BOM(210, "stationBomExcelImportService", "工位BOM表"), - MES_DATA_OBJECT(220, "dataObjectExcelImportService", "数据对象"), - MES_OBJECT_CFG(230, "objectCfgExcelImportService", "对象结构"), - MES_WC_CHECK(240, "wcCheckExcelImportService", "开线检查，支持编辑"), - MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelImportService", "质量检测标准，支持编辑"), - MES_FAULT_CAUSE(260, "faultCauseExcelImportService", "设备故障原因，支持编辑"), - MES_FAULT_METHOD(270, "faultMethodExcelImportService", "设备故障处理措施，支持编辑"), - MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelImportService", "设备故障现象，支持编辑"), - MES_DEFECT(290, "defectExcelImportService", "缺陷，支持编辑"), - MES_DEFECT_CAUSE(300, "defectCauseExcelImportService", "缺陷原因，支持编辑"), - MES_SCRAP(310, "scrapExcelImportService", "报废原因，支持编辑"), - MES_REPAIR(320, "repairExcelImportService", "质量数据处理措施，支持编辑"), - MES_EQU_TASK_PLAN(330, "equTaskPlanExcelImportService", "设备作业周期计划，支持编辑"), - MES_PART_OJBECT(340, "partObjectExcelImportService", "物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelImportService", "工序工作单元"), - MES_DATASOURCE(360, "datasourceExcelImportService", "DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelImportService", "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelImportService", "设备通知对象"), - MES_PLC(390, "plcExcelImportService", "PLC地址清单，支持编辑"), - MES_PROCESS(400, "processExcelImportService", "工序信息"), - MES_KPSN_RULE(410, "kpsnRuleExcelImportService", "关键件条码校验规则，支持编辑"), - MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelImportService", "客户JIT生产队列"), - MES_PART_BOM_IMPORT(430, "partBomExcelImportService", "散件BOM导入"), - MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制，支持编辑"); + public enum MES_EXCEL { + + MES_PLAN_ORDER(10, "planOrderExcelService", "生产计划"), + MES_EQUIPMENT(20, "equipmentExcelService", "设备台账，支持编辑"), + MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelService", "设备作业要求，支持编辑"), + MES_CUST_ORDER(40, "custOrderExcelService", "客户订单"), + MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelService", "PCN同步配置"), + MES_PART(60, "partExcelService", "物料表，支持编辑"), + MES_PRODUCE_CATEGORY(70, "produceCategoryExcelService", "产品类型"), + MES_PACK_SPEC(80, "packSpecExcelService", "包装规格，支持编辑"), + MES_PROD_PACK(90, "prodPackExcelService", "产品包装关系"), + MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelService", "产品编码配置"), + MES_BOM(110, "bomExcelService", "物料清单，支持编辑"), + MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelService", "产品配置类型"), + MES_CUSTOMER(130, "customerExcelService", "客户表，支持编辑"), + MES_CUSTOMER_PART(140, "customerPartExcelService", "客户零件关系表，支持编辑"), + MES_WORK_CENTER(150, "workCenterExcelService", "生产线，支持编辑"), + MES_WORK_CELL(160, "workCellExcelService", "工位，支持编辑"), + MES_WC_EQUIPMENT(170, "wcEquipmentExcelService", "工位设备关系表"), + MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"), + MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"), + MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"), + MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"), + MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"), + MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"), + MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"), + MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelService", "质量检测标准，支持编辑"), + MES_FAULT_CAUSE(260, "faultCauseExcelService", "设备故障原因，支持编辑"), + MES_FAULT_METHOD(270, "faultMethodExcelService", "设备故障处理措施，支持编辑"), + MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelService", "设备故障现象，支持编辑"), + MES_DEFECT(290, "defectExcelService", "缺陷，支持编辑"), + MES_DEFECT_CAUSE(300, "defectCauseExcelService", "缺陷原因，支持编辑"), + MES_SCRAP(310, "scrapExcelService", "报废原因，支持编辑"), + MES_REPAIR(320, "repairExcelService", "质量数据处理措施，支持编辑"), + MES_EQU_TASK_PLAN(330, "equTaskPlanExcelService", "设备作业周期计划，支持编辑"), + MES_PART_OJBECT(340, "partObjectExcelService", "物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelService", "工序工作单元"), + MES_DATASOURCE(360, "datasourceExcelService", "DB地址清单"), + MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelService", "设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelService", "设备通知对象"), + MES_PLC(390, "plcExcelService", "PLC地址清单，支持编辑"), + MES_PROCESS(400, "processExcelService", "工序信息"), + MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"), + MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), + MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), + MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"); private int value; private String service; private String description; - MES_INSERT_EXCEL(int value, String service, String description) { + MES_EXCEL(int value, String service, String description) { this.value = value; this.service = service; this.description = description; @@ -1865,10 +1865,10 @@ public class MesEnumUtil { return description; } - public static MES_INSERT_EXCEL getByValue(int value) { - for (MES_INSERT_EXCEL mesInsertExcel : values()) { - if (mesInsertExcel.getValue() == value) { - return mesInsertExcel; + public static MES_EXCEL getByValue(int value) { + for (MES_EXCEL excel : values()) { + if (excel.getValue() == value) { + return excel; } } return null; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java index 23a5718..3a9d9e4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java @@ -19,4 +19,8 @@ public class ExportDataModel { private String exportCol; + private String title; + + private Integer module; + } From 32f6215be7340264ef745ca9ebc502886f5b31b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 28 Apr 2020 19:12:30 +0800 Subject: [PATCH 028/134] =?UTF-8?q?=E3=80=908309=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E9=85=8D=E6=96=B9=E5=AF=BC=E5=85=A5-=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++++ .../estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) 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 0bc3879..48a7682 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 @@ -91,6 +91,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @Transient private List childQcList; + @Transient + @ApiParam("备注") + private String memo; + public MesQcCheckStandard() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java index d7ca7a5..9fce24b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -16,23 +16,28 @@ import lombok.Data; @Api(value="生产工单导入",description = "生产工单导入") public class MesWorkOrderModel { - @ApiParam("工单号") + //工单号 + @ApiParam("OrderCode") @AnnoOutputColumn private String orderNo; - @ApiParam("物料号") + //物料号 + @ApiParam("ItemCode") @AnnoOutputColumn private String partNo; - @ApiParam("客户产线代码") + //客户产线代码 + @ApiParam("ProductionLineID") @AnnoOutputColumn - private String custProdLineCode; + private String workCenterCode; - @ApiParam("数量") + //数量 + @ApiParam("DemandQty") @AnnoOutputColumn private Double qty; - @ApiParam("开始时间") + //开始时间 + @ApiParam("ProductDate") @AnnoOutputColumn private String startTime; From 3227cfa47eb0253840aca49824c9b528a05406a2 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 28 Apr 2020 21:19:31 +0800 Subject: [PATCH 029/134] [oee] --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 222 +++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 112 +++++++++++ .../i3plus/pojo/mes/bean/MesOperateObject.java | 45 +++++ .../pojo/mes/bean/MesOperateObjectAttribute.java | 48 +++++ .../i3plus/pojo/mes/bean/MesOperateObjectCfg.java | 65 ++++++ .../i3plus/pojo/mes/bean/MesScriptPersistence.java | 56 ++++++ .../pojo/mes/repository/MesOeeRepository.java | 15 ++ .../MesOperateObjectAttributeRepository.java | 15 ++ .../repository/MesOperateObjectCfgRepository.java | 15 ++ .../mes/repository/MesOperateObjectRepository.java | 15 ++ .../repository/MesScriptPersistenceRepository.java | 15 ++ 11 files changed, 623 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index e126301..0629798 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 @@ -5174,4 +5174,226 @@ public class MesEnumUtil { } } + + /** + * 运算对象属性 运算类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATE_TYPE { + OEE(10, "OEE"), + MTBF(20, "MTBF平均故障间隔"), + MTTR(30, "MTTR平均修理时间"); + + private int value; + private String description; + + OPERATE_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; + } + } + + /** + * 运算对象属性 属性类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ATTRIBUTE_TYPE { + STANDARD_ATTRIBUTE(10, "标准属性"), + CUSTOM_ATTRIBUTE(20, "自定义属性"); + + private int value; + private String description; + + ATTRIBUTE_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; + } + } + + /** + * 运算对象属性配置 赋值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VALUE_TYPE { + MANUAL_ASSIGNMENT(10, "手工赋值"), + SPEL_EXPRESSION(20, "spel表达式"), + FUNCTION_ASSIGNMENT(30, "函数赋值"), + JOB_ASSIGNMENT(40, "job赋值"); + + private int value; + private String description; + + VALUE_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; + } + } + + /** + * 运算对象 运算类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OBJECT_CODE { + ORGANIZE_OEE(10, "工厂OEE"), + WORK_CENTER_OEE(20, "产线OEE"), + WORK_CELL_CEE(30, "工位OEE"), + EQU_OEE(40, "设备OEE"); + + private int value; + private String description; + + OBJECT_CODE(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; + } + } + + /** + * 脚本类型（组件、表单、报表、JOB、其他） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRIPT_TYPE { + ORGANIZE_OEE(10, "组件"), + WORK_CENTER_OEE(20, "表单"), + WORK_CELL_CEE(30, "报表"), + JOB(40, "JOB"), + OTHER(50, "其他"); + + private int value; + private String description; + + SCRIPT_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; + } + } + + /** + * 语言类型（Groovy、Python、JavaScript、Scala、Ruby） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRIPT_LANGUAGE { + GROOVY(10, "Groovy"), + PYTHON(20, "Python"), + JAVA_SCRIPT(30, "JavaScript"), + SCALA(40, "Scala"), + RUBY(50, "Ruby"); + + private int value; + private String description; + + SCRIPT_LANGUAGE(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-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 new file mode 100644 index 0000000..81b3951 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -0,0 +1,112 @@ +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/28 4:19 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OEE") +@Api("MES_OEE数据") +public class MesOee extends BaseBean implements Serializable { + + private static final long serialVersionUID = -9163026983140909748L; + + @Column(name = "OBJECT_CODE") + @ApiParam("运算对象代码") + private String objectCode; + + @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; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "OEE_DATE") + @ApiParam("日期") + private String oeeDate; + + @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 = "TOTAL_RUN_TIME") + @ApiParam("总生产时间") + private String totalRunTime; + + @Column(name = "TOTAL_STOP_TIME") + @ApiParam("总停机时间") + private String totalStopTime; + + @Column(name = "TOTAL_QTY") + @ApiParam("总生产数") + private Integer totalQty; + + @Column(name = "QUALIFIED_QTY") + @ApiParam("一次合格数") + private Integer qualifiedQty; + + @Column(name = "PLAN_TAKT") + @ApiParam("计划节拍") + private Integer planTakt; + + @Column(name = "ACTUAL_TAKT") + @ApiParam("实际节拍") + private Integer actualTakt; + + @Column(name = "TIME_RATE") + @ApiParam("时间开动率") + private String timeRate; + + @Column(name = "TAKT_RATE") + @ApiParam("性能开动率") + private String taktRate; + + @Column(name = "QUALIFIED_RATE") + @ApiParam("良品率") + private String qualifiedRate; + + @Column(name = "OEE") + @ApiParam("OEE") + private String oee; + + @Column(name = "BUSI_DATA") + @ApiParam("自定义数据") + private String busiData; +} 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 new file mode 100644 index 0000000..99cc4bb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.java @@ -0,0 +1,45 @@ +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/28 4:04 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OPERATE_OBJECT") +@Api("MES_运算对象") +public class MesOperateObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7829216855303543146L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "OPERATE_TYPE") + @ApiParam("运算类型") + private Integer operateType; + +} 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 new file mode 100644 index 0000000..56649b6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.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; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 4:08 下午 + * @Modify:MES_OPERATE_OBJECT_CFG + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE") +@Api("MES_运算对象属性") +public class MesOperateObjectAttribute extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3916105499867386686L; + + @Column(name = "ATTRIBUTE_CODE") + @ApiParam("属性代码") + private String attributeCode; + + @Column(name = "ATTRIBUTE_NAME") + @ApiParam("属性名称") + private String attributeName; + + @Column(name = "ATTRIBUTE_TYPE") + @ApiParam("属性类型") + private Integer attributeType; + + @Column(name = "OPERATE_TYPE") + @ApiParam("运算类型") + private Integer operateType; +} 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 new file mode 100644 index 0000000..cc3a177 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java @@ -0,0 +1,65 @@ +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/28 4:12 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE") +@Api("MES_运算对象属性配置") +public class MesOperateObjectCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8066603810736365082L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "ATTRIBUTE_CODE") + @ApiParam("属性代码") + private String attributeCode; + + @Column(name = "VALUE_TYPE") + @ApiParam("赋值类型") + private String valueType; + + @Column(name = "METHOD_CODE") + @ApiParam("函数方法") + private String methodCode; + + @Column(name = "JOB_ID") + @ApiParam("job编号") + private String jobId; + + @Column(name = "SPEL_CONTENT") + @ApiParam("spel表达式") + private String spelContent; + + @Column(name = "SEQ") + @ApiParam("运算顺序") + private Integer seq; + + @Transient + @ApiParam("属性名称") + private String attributeName; +} 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 new file mode 100644 index 0000000..945aa56 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.java @@ -0,0 +1,56 @@ +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/28 4:58 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRIPT_PERSISTENCE") +@Api("动态脚本") +public class MesScriptPersistence extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1941422535481564572L; + + @Column(name = "SCRIPT_NO") + @ApiParam("脚本编号") + private String scriptNo; + + @Column(name = "SCRIPT_NAME") + @ApiParam("脚本名称") + private String scriptName; + + @Column(name = "SCRIPT_REMARK") + @ApiParam("脚本描述") + private String scriptRemark; + + @Column(name = "SCRIPT_TYPE") + @ApiParam("脚本类型") + private Integer scriptType; + + @Column(name = "LANGUAGE_TYPE") + @ApiParam("语言类型") + private Integer languageType; + + @Column(name = "SCRIPT_CONTENT") + @ApiParam("脚本内容") + private String scriptContent; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.java new file mode 100644 index 0000000..427d72e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOeeRepository.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.MesOee; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:04 下午 + * @Modify: + */ +@Repository +public interface MesOeeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.java new file mode 100644 index 0000000..e8add57 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectAttributeRepository.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.MesOperateObjectAttribute; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:05 下午 + * @Modify: + */ +@Repository +public interface MesOperateObjectAttributeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.java new file mode 100644 index 0000000..70241ae --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectCfgRepository.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.MesOperateObjectCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:04 下午 + * @Modify: + */ +@Repository +public interface MesOperateObjectCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.java new file mode 100644 index 0000000..1d904cf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOperateObjectRepository.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.MesOperateObject; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:05 下午 + * @Modify: + */ +@Repository +public interface MesOperateObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.java new file mode 100644 index 0000000..d5ca681 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScriptPersistenceRepository.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.MesScriptPersistence; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/28 5:03 下午 + * @Modify: + */ +@Repository +public interface MesScriptPersistenceRepository extends BaseRepository { +} From 90edd435e3b27d01a65bba54ec84b8eb74c9788b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 29 Apr 2020 11:50:33 +0800 Subject: [PATCH 030/134] bug:8293;8297 --- .../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 ce953ae..d55adea 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 @@ -5720,7 +5720,7 @@ public class WmsEnumUtil { public enum DOCK_ORDER_STATUS { WAIT_SEND(10, "待送货"), ARRIVED(20, "已到达"), - CANCELED(30, "已取消"); + CANCELED(40, "已取消"); private int value; private String description; From ae156ad82fc216fff93557e183e22d53621631ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 29 Apr 2020 14:57:38 +0800 Subject: [PATCH 031/134] =?UTF-8?q?=E3=80=90=E5=8A=A8=E6=80=81=E6=8C=89?= =?UTF-8?q?=E9=92=AE--=E5=AE=8C=E6=88=90=E6=8C=89=E9=92=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9mes=E5=92=8Cmespcn=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 6a70107..f244016 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 @@ -260,6 +260,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("计划类型") private Integer planType; + @Transient + @ApiParam(value = "完成按钮编号") + public String comButtonCode; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 32460a3272aa4ac76fef70a5ff5127b1a48e4e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 29 Apr 2020 15:07:54 +0800 Subject: [PATCH 032/134] =?UTF-8?q?sqlserver=20=E9=80=82=E9=85=8D=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=8Cin=20=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 839d22a..8e68d4d 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 @@ -53,6 +53,21 @@ public class CoreHqlPack { return result.toString(); } + + /** + * In 参数封装 + * @param columnName + * @return + */ + public static DdlPackBean packHqlInStr(String columnName, String[] params){ + DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean); + DdlPreparedPack.getInPack(params, columnName, ddlPackBean); + return ddlPackBean; + } + + /** * 资源查询 * @param resource From 6e2344b30342e4c3c480aacd3579895c027fb761 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 29 Apr 2020 15:25:29 +0800 Subject: [PATCH 033/134] bug:8330 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 4 ++++ 1 file changed, 4 insertions(+) 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 b7e6d03..e2ff9c2 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 @@ -72,6 +72,10 @@ public class WmsDockOrderInfo extends BaseBean { private String orderNo; @Transient + @ApiParam("驾驶员编码") + private String driverNo; + + @Transient @ApiParam("库位代码") private Integer masterStatus; } From f03e11956118778f5761e5785b90f157295628ad Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 29 Apr 2020 16:37:19 +0800 Subject: [PATCH 034/134] bug:8268;8267;8266;8265 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 ++- .../estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 10 +++ .../pojo/wms/bean/WmsDocMovementDetails.java | 7 ++- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 +++ .../estsh/i3plus/pojo/wms/dto/AssignmentDto.java | 72 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java | 3 + .../pojo/wms/dto/WmsSupplierExtensionDto.java | 6 +- 7 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.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 8bc0ba9..870d120 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 @@ -715,8 +715,8 @@ public class WmsEnumUtil { PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), - EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"); - + EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), + LOADING_ORDER(530, "LOADING_ORDER", "装车单"); private int value; private String code; private String description; @@ -3567,7 +3567,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); + SOURCE(10, "实物条码"), + TARGET(20, "虚拟条码"), + CUST_SN(30, "客户条码"), + FIRST_MIDDLE_LAST(40, "首中末件"); private int value; private String description; 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 f250b58..90d32ae 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 @@ -47,4 +47,14 @@ public class WmsCustWindow extends BaseBean { @Column(name = "DELAY_HOUR") @ApiParam(value = "容差") private Integer delayHour; + + public WmsCustWindow(WmsCustWindow custWindow) { + this.custNo = custWindow.getCustNo(); + this.custWindowTime = custWindow.getCustWindowTime(); + this.weeks = custWindow.getWeeks(); + this.delayHour = custWindow.getDelayHour(); + } + + public WmsCustWindow() { + } } 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 574361d..5398ffd 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 @@ -1,7 +1,6 @@ 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.WmsEnumUtil; import io.swagger.annotations.Api; @@ -359,4 +358,10 @@ public class WmsDocMovementDetails extends BaseBean { this.modifyDatetime = modifyDatetime; } + + public WmsDocMovementDetails(WmsPOMasterDetails poMasterDetails) { + this.orderNo = poMasterDetails.getOrderNo(); + this.planDate = poMasterDetails.getPlanDate(); + this.planTime = poMasterDetails.getPlanTime(); + } } 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 3fe234b..9b74c53 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 @@ -217,4 +217,12 @@ public class WmsDocMovementMaster extends BaseBean { public int getBusiTypeVal() { return this.busiType == null ? 0 : this.busiType; } + + public WmsDocMovementMaster(WmsPOMaster wmsPoMaster) { + this.orderNo = wmsPoMaster.getOrderNo(); + this.vendorNo = wmsPoMaster.getVendorNo(); + } + + public WmsDocMovementMaster() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java new file mode 100644 index 0000000..45776dc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description : 发运计划任务跟踪 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-27 4:37 下午 + * @Modify: + **/ +@Data +@Entity +public class AssignmentDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "单号") + private String orderNo; + + @ApiParam(value = "时间") + private String createDatetime; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "源存储区") + private String srcZoneNo; + + @ApiParam(value = "客户编码") + private String custNo; + + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @ApiParam(value = "状态中文描述", example = "1") + private String itemStatusStr; + + @ApiParam(value = "出库数量") + private Double outQty; + + public AssignmentDto(String orderNo, String createDatetime, String partNameRdd, + String srcZoneNo, String custNo, Integer itemStatus, Double outQty, String partNo) { + this.orderNo = orderNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.srcZoneNo = srcZoneNo; + this.custNo = custNo; + this.itemStatus = itemStatus; + this.outQty = outQty; + this.partNo = partNo; + } + + public AssignmentDto() { + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java index ffaf492..9f03900 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -72,4 +72,7 @@ public class WmsStockSnDto { this.partSpec = partSpec; this.zoneNo = zoneNo; } + + public WmsStockSnDto() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java index 680c401..a1db922 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java @@ -21,6 +21,9 @@ public class WmsSupplierExtensionDto { @ApiParam(value = "供应商编号") private String vendorNo; + @ApiParam(value = "供应商编号") + private String vendorName; + @ApiParam(value = "数量") private Integer num; @@ -28,8 +31,9 @@ public class WmsSupplierExtensionDto { } - public WmsSupplierExtensionDto(String vendorNo, Integer num) { + public WmsSupplierExtensionDto(String vendorNo, Integer num, String vendorName) { this.vendorNo = vendorNo; this.num = num; + this.vendorName = vendorName; } } From e5e41f09e7eec67a2be528e46cfa97431f962fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 29 Apr 2020 16:44:12 +0800 Subject: [PATCH 035/134] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=A3=E4=BB=B6?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= 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 0e1510d..f429143 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 @@ -2495,6 +2495,30 @@ public class MesHqlPack { return packBean; } + /** + * 散件产品组配置 + * + * @param mesProdScatterDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesScatterDetail(MesProdScatterDetail mesProdScatterDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdScatterDetail, organizeCode); + if (!StringUtils.isEmpty(mesProdScatterDetail.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getProduceCtgyCode())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getSpCfgCode())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getSpCfgCode(), "spCfgCode", packBean); + } + return packBean; + } + public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); From e63601716fa03490c5b6fcf20e1b2950d64aa119 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 29 Apr 2020 16:51:33 +0800 Subject: [PATCH 036/134] =?UTF-8?q?1736-MES=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 69 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java | 61 +++++++++++++++++++ .../estsh/i3plus/pojo/mes/model/FilterGroup.java | 11 ++++ .../cn/estsh/i3plus/pojo/mes/model/FilterRule.java | 10 ++++ .../i3plus/pojo/mes/model/FilterRuleAndOr.java | 11 ++++ .../i3plus/pojo/mes/model/PojoFieldModel.java | 48 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/PojoModel.java | 38 ++++++++++++ .../pojo/mes/repository/MesDataAuthRepository.java | 17 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 11 ++++ 9 files changed, 276 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 686e6eb..5088598 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 @@ -11,6 +11,75 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class MesEnumUtil { + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HQL_EXPRESSION { + GT(10,">","大于"), + LT(20,"<","小于"), + EQ(30,"=","等于"), + NEQ(40,"!=","不等于"), + GTE(50,">=","大于等于"), + LTE(60,"<=","小于等于"), + LIKE(70,"like","LIKE"), + IN(80,"in","包含"); + + private int value; + private String code; + private String description; + + HQL_EXPRESSION(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 codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public 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 String valueOfDescription(int val) { + return valueOf(val); + } + } + /** * 作业程序组件类型 */ 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 new file mode 100644 index 0000000..10f8597 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java @@ -0,0 +1,61 @@ +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.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-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_AUTH") +@Api("数据权限") +public class MesDataAuth extends BaseBean implements Serializable { + private static final long serialVersionUID = -8665559475167190408L; + @Column(name = "ROLE_ID") + @ApiParam("角色编号") + private Long roleId; + + @Column(name = "ROLE_NAME") + @ApiParam("角色名称") + private String roleName; + + @Column(name = "DATA_OBJECT") + @ApiParam("数据对象") + private String dataObject; + + @Column(name = "DATA_OBJECT_NAME") + @ApiParam("数据对象名称") + private String dataObjectName; + + @Column(name = "FILTER_RULE", columnDefinition = "TEXT") + @ApiParam("过滤规则") + private String filterRule; + + public long getRoleIdVal() { + return this.roleId == null ? 0 : this.roleId.longValue(); + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java new file mode 100644 index 0000000..a262480 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class FilterGroup { + private String andOr; + private List groups; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java new file mode 100644 index 0000000..0d91df9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +@Data +public class FilterRule { + private String filed; + private String op; + private String value; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java new file mode 100644 index 0000000..1991cfd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class FilterRuleAndOr { + private String andOr; + private List rules; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java new file mode 100644 index 0000000..21671e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : PojoField模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + * @Modify: + **/ +@Data +public class PojoFieldModel implements Serializable { + private static final long serialVersionUID = 6761788924707802928L; + + @ApiParam(value ="属性名") + private String fieldName; + + @ApiParam(value ="属性类型") + private String fieldType; + + @ApiParam(value ="属性描述") + private String fieldDesc; + + @ApiParam(value ="字段名称") + private String fieldColumnName; + + @ApiParam(value = "数据来源") + private String dataSrc; + + @ApiParam(value = "开窗列表显示列名称") + private String listColumnName; + + @ApiParam(value = "开窗搜索列名称") + private String searchColumnName; + + @ApiParam(value = "回显列名") + private String explicitColumnName; + + @ApiParam(value = "下拉框规则") + private Integer selectRule; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java new file mode 100644 index 0000000..230c8a2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Pojo模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + **/ +@Data +public class PojoModel implements Serializable { + private static final long serialVersionUID = -3617516560880011259L; + @ApiParam(value ="包名") + private String packageName; + + @ApiParam(value ="POJO类名") + private String simpleName; + + @ApiParam(value ="POJO类全名") + private String fullName; + + @ApiParam(value ="表名称名") + private String tableName; + + @ApiParam(value ="POJO类描述") + private String pojoDesc; + + @ApiParam(value ="属性集合") + private List fieldList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java new file mode 100644 index 0000000..73d98eb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBom; +import cn.estsh.i3plus.pojo.mes.bean.MesDataAuth; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesDataAuthRepository 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 0e1510d..51701ae 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 @@ -2625,4 +2625,15 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + if (!StringUtils.isEmpty(dataAuth.getDataObject())) { + DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean); + } + if (dataAuth.getRoleIdVal() > 0) { + DdlPreparedPack.getNumEqualPack(dataAuth.getRoleIdVal(), "roleId", packBean); + } + return packBean; + } } From fdaa4c174050d857b5990948dd01c4d4611ca869 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 29 Apr 2020 17:12:10 +0800 Subject: [PATCH 037/134] bug:8268;8267;8266;8265 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 7 ++----- 1 file changed, 2 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 870d120..06d2317 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 @@ -3567,10 +3567,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), - TARGET(20, "虚拟条码"), - CUST_SN(30, "客户条码"), - FIRST_MIDDLE_LAST(40, "首中末件"); + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); private int value; private String description; @@ -5723,6 +5720,7 @@ public class WmsEnumUtil { public enum DOCK_ORDER_STATUS { WAIT_SEND(10, "待送货"), ARRIVED(20, "已到达"), + RECEIVED(30, "已收货"), CANCELED(40, "已取消"); private int value; @@ -6612,5 +6610,4 @@ public class WmsEnumUtil { return valueOf(val); } } - } From dd706887544ec0600aa5b088c8faa37c4ffab794 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 29 Apr 2020 20:21:41 +0800 Subject: [PATCH 038/134] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=84=9A=E6=9C=ACWeb?= =?UTF-8?q?Socket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/ScriptLoggerModel.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java new file mode 100644 index 0000000..4e90509 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 脚本执行日志 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-29 + * @Modify: + **/ +@Data +@Api("插件日志") +public class ScriptLoggerModel { + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("用户编号") + private String userCode; + + @ApiParam("脚本编号") + private String scriptNo; + + @ApiParam("日志内容") + private String context; + + @ApiParam("日志打印日期") + private String printDate; +} From f38a47cc6856ef84a86cc2e49d0f94526779c5bc Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 29 Apr 2020 23:03:50 +0800 Subject: [PATCH 039/134] =?UTF-8?q?[oee=20=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 143 ++++++++++++++++++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 14 ++ .../i3plus/pojo/mes/bean/MesOffLineRecord.java | 31 +++++ .../pojo/mes/bean/MesOperateObjectAttribute.java | 9 ++ 4 files changed, 176 insertions(+), 21 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 37a9a56..1eda477 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 @@ -5320,20 +5320,20 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VALUE_TYPE { - MANUAL_ASSIGNMENT(10, "手工赋值"), - SPEL_EXPRESSION(20, "spel表达式"), - FUNCTION_ASSIGNMENT(30, "函数赋值"), - JOB_ASSIGNMENT(40, "job赋值"); + MANUAL_ASSIGNMENT("10", "手工赋值"), + SPEL_EXPRESSION("20", "spel表达式"), + FUNCTION_ASSIGNMENT("30", "函数赋值"), + JOB_ASSIGNMENT("40", "job赋值"); - private int value; + private String value; private String description; - VALUE_TYPE(int value, String description) { + VALUE_TYPE(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -5341,10 +5341,19 @@ public class MesEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static VALUE_TYPE getByValue(String value) { + for (VALUE_TYPE valueType : values()) { + if (valueType.getValue().equals(value)) { + return valueType; + } + } + return null; + } + + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -5353,24 +5362,24 @@ public class MesEnumUtil { } /** - * 运算对象 运算类型 + * 运算对象 对象代码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OBJECT_CODE { - ORGANIZE_OEE(10, "工厂OEE"), - WORK_CENTER_OEE(20, "产线OEE"), - WORK_CELL_CEE(30, "工位OEE"), - EQU_OEE(40, "设备OEE"); + ORGANIZE_OEE("10", "工厂OEE"), + WORK_CENTER_OEE("20", "产线OEE"), + WORK_CELL_CEE("30", "工位OEE"), + EQU_OEE("40", "设备OEE"); - private int value; + private String value; private String description; - OBJECT_CODE(int value, String description) { + OBJECT_CODE(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -5378,10 +5387,19 @@ public class MesEnumUtil { return description; } + public static OBJECT_CODE getByValue(String value) { + for (OBJECT_CODE objectCode : values()) { + if (objectCode.getValue().equals(value)) { + return objectCode; + } + } + return null; + } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -5394,9 +5412,9 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SCRIPT_TYPE { - ORGANIZE_OEE(10, "组件"), - WORK_CENTER_OEE(20, "表单"), - WORK_CELL_CEE(30, "报表"), + ASSEMBLY(10, "组件"), + FORM(20, "表单"), + REPORT_FORM(30, "报表"), JOB(40, "JOB"), OTHER(50, "其他"); @@ -5465,4 +5483,87 @@ public class MesEnumUtil { } } + + + /** + * 运算对象代码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATE_OBJECT_CODE { + ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"), + ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"), + WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"), + EQU_OEE_DAY("EQU_OEE_Day", "设备OEE(天)"); + + private String value; + private String description; + + OPERATE_OBJECT_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static OPERATE_OBJECT_CODE getByValue(String value) { + for (OPERATE_OBJECT_CODE objectCode : values()) { + if (objectCode.getValue().equals(value)) { + return objectCode; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * oee 运算状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OEE_STATUS { + STAY_OPERATE(10, "待运算"), + ALREADY_OPERATE(20, "已运算"); + + private int value; + private String description; + + OEE_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-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 81b3951..2a3b94c 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 @@ -11,7 +11,9 @@ 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: @@ -109,4 +111,16 @@ public class MesOee extends BaseBean implements Serializable { @Column(name = "BUSI_DATA") @ApiParam("自定义数据") private String busiData; + + @Transient + @ApiParam("开始日期") + private String oeeDateStart; + + @Transient + @ApiParam("结束日期") + private String oeeDateEnd; + + @Transient + @ApiParam("自定义数据map") + private List operateObjectAttributes; } 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 46fe2ed..6c668db 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 @@ -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; /** @@ -65,4 +66,34 @@ public class MesOffLineRecord extends BaseBean implements Serializable { @Column(name = "OFF_LINE_TIME") @ApiParam("下线时间") private String offLineTime; + + /*************冗余字段****************/ + + @Transient + @ApiParam("设备代码") + private String equCode; + + @Transient + @ApiParam("运算对象代码") + private String objectCode; + + @Transient + @ApiParam("日期") + private String oeeDate; + + @Transient + @ApiParam("开始时段") + private String startTime; + + @Transient + @ApiParam("结束时段") + private String endTime; + + @Transient + @ApiParam("一次合格数") + private Integer qualifiedQty; + + @Transient + @ApiParam("总生产数") + private Integer totalQty; } 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 56649b6..e05a54e 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 @@ -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,12 @@ public class MesOperateObjectAttribute extends BaseBean implements Serializable @Column(name = "OPERATE_TYPE") @ApiParam("运算类型") private Integer operateType; + + @Transient + @ApiParam("属性值") + private String attributeValue; + + @Transient + @ApiParam("是否自定义属性") + private boolean customAttribute = false; } From 888d87f12e7d892d6b4eeeb9efd56b99ab4f7eaa Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 30 Apr 2020 09:25:53 +0800 Subject: [PATCH 040/134] task edi --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++ .../cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java | 42 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index e126301..614b6b5 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 @@ -430,6 +430,9 @@ public class MesEnumUtil { NEVER(-1, "不过期"), ONE_HOUR(3600, "一小时"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), + TEN_MIN(300, "十分钟"), ONE_MIN(60, "一分钟"); private int value; 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 new file mode 100644 index 0000000..f21e756 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java @@ -0,0 +1,42 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/4/28 21:30 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EDI_DATA") +@Api("EDI数据") +public class MesEdiData extends BaseBean implements Serializable { + private static final long serialVersionUID = 4671561947551462256L; + + @Column(name = "HOST") + @ApiParam("edi电脑名") + private String host; + + @Column(name = "DATA") + @ApiParam("数据") + private String data; + + @Column(name = "CONFIG") + @ApiParam("edi配置") + private String config; +} From 2b85a056455cb2db14747c2df6d1269f27d6527d Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Apr 2020 09:41:58 +0800 Subject: [PATCH 041/134] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=84=9A=E6=9C=ACWeb?= =?UTF-8?q?Socket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/EngineScriptPersistenceHistory.java | 63 ++++++++++++++++++++++ .../EngineScriptPersistenceHistoryRepository.java | 9 ++++ 2 files changed, 72 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java new file mode 100644 index 0000000..edefeab --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.wms.engine.script; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +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.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * 脚本持久化历史记录 + * + * @author jason.niu + * @since 2020-04-29 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "SCRIPT_PERSISTENCE_HISTORY") +@Api("系统动态脚本") +public class EngineScriptPersistenceHistory extends BaseBean { + + // 脚本调用的唯一编号，例如：WMS_PDA_0001 + @Column(name = "SCRIPT_NO", length = 50) + private String scriptNo; + + // 脚本的中文名称 + @Column(name = "SCRIPT_NAME", length = 50) + private String scriptName; + + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 + @Column(name = "SCRIPT_TYPE") + private Integer scriptType; + + // 脚本编写的语言 + // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + @Column(name = "LANGUAGE_TYPE") + private Integer languageType; + + // 脚本的具体内容 + @Lob + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + private String scriptContent; + + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private Object compiledScript; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java new file mode 100644 index 0000000..52818f2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.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.engine.script.EngineScriptPersistenceHistory; +import org.springframework.stereotype.Repository; + +@Repository +public interface EngineScriptPersistenceHistoryRepository extends BaseRepository { +} From c5d4cd7dad4b5abce0de6760449ea4cd055b9bd0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 Apr 2020 10:10:41 +0800 Subject: [PATCH 042/134] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=BC=96=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ExcelDataParamModel.java | 181 +++++++++++++++++++++ .../pojo/mes/model/ProdPlanBatchCompileModel.java | 51 +++++- 2 files changed, 229 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java new file mode 100644 index 0000000..f9eeea2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java @@ -0,0 +1,181 @@ +//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 org.apache.poi.ss.usermodel.CellStyle; +//import org.springframework.util.StringUtils; +// +//import java.io.Serializable; +//import java.math.BigDecimal; +// +///** +// * @Author: wangjie +// * @CreateDate: 2019/8/21 9:19 AM +// * @Description: +// **/ +//@Data +//@NoArgsConstructor +//@AllArgsConstructor +//@Api("EXCEL参数model") +//public class ExcelDataParamModel implements Serializable { +// +// public ExcelDataParamModel(Class clazz){ +// this.clazz = clazz; +// } +// +// @ApiParam("获取相对应的类，用来映射数据,如果不设置此值，那么整个数据将会用String[]作为数据，不再通过映射拿取数据") +// private Class clazz; +// +// @ApiParam("对应类的映射字段名，String类型") +// private String[] strField; +// +// @ApiParam("对应类的标题，需要一一对应") +// private String[] titleStr; +// +// @ApiParam("大标题") +// private String title; +// +// @ApiParam("文件名，如果传入的ExcelDataParamModel是一个List的时候，以sheetNo = 1为文件名，如果sheetNo为空，则默认随机") +// private String fileName; +// +// @ApiParam("后缀") +// private String sufix; +// +// @ApiParam("大标题样式") +// private CellStyle bigTitleCellStyle; +// +// @ApiParam("标题样式") +// private CellStyle titleCellStyle; +// +// @ApiParam("数据样式") +// private CellStyle cellStyle; +// +// @ApiParam("sheet名") +// private String sheetName; +// +// @ApiParam("每个格子的宽度") +// private BigDecimal[] cellWidth; +// +// @ApiParam("如果传入的ExcelDataParamModel是List的时候，默认以sheetNo排序") +// private Integer sheetNo; +// +// @ApiParam("导出数据转换器") +// private QueryDataInterface queryDataInterface; +// +// public Class getClazz() { +// return clazz; +// } +// +// public String[] getStrField() { +// return strField; +// } +// +// public String[] getTitleStr() { +// return titleStr; +// } +// +// public String getTitle() { +// if(StringUtils.isEmpty(this.title)){ +// return "无效的标题"; +// }else{ +// return title; +// } +// } +// +// public String getFileName() { +// if(StringUtils.isEmpty(this.fileName)){ +// return "未命名"; +// }else{ +// return this.fileName; +// } +// } +// +// public CellStyle getBigTitleCellStyle() { +// return bigTitleCellStyle; +// } +// +// public CellStyle getTitleCellStyle() { +// return titleCellStyle; +// } +// +// public CellStyle getCellStyle() { +// return cellStyle; +// } +// +// public String getSheetName() { +// return sheetName; +// } +// +// public Integer getSheetNo() { +// return sheetNo; +// } +// +// public BigDecimal[] getCellWidth() { +// return cellWidth; +// } +// +// public String getSufix() { +// return sufix; +// } +// +// public QueryDataInterface getQueryDataInterface() { +// return queryDataInterface; +// } +// +// public void setClazz(Class clazz) { +// this.clazz = clazz; +// } +// +// public void setStrField(String[] strField) { +// this.strField = strField; +// } +// +// public void setTitleStr(String[] titleStr) { +// this.titleStr = titleStr; +// } +// +// public void setTitle(String title) { +// this.title = title; +// } +// +// public void setFileName(String fileName) { +// this.fileName = fileName; +// } +// +// public void setSufix(String sufix) { +// this.sufix = sufix; +// } +// +// public void setBigTitleCellStyle(CellStyle bigTitleCellStyle) { +// this.bigTitleCellStyle = bigTitleCellStyle; +// } +// +// public void setTitleCellStyle(CellStyle titleCellStyle) { +// this.titleCellStyle = titleCellStyle; +// } +// +// public void setCellStyle(CellStyle cellStyle) { +// this.cellStyle = cellStyle; +// } +// +// public void setSheetName(String sheetName) { +// this.sheetName = sheetName; +// } +// +// public void setCellWidth(BigDecimal[] cellWidth) { +// this.cellWidth = cellWidth; +// } +// +// +// public void setSheetNo(Integer sheetNo) { +// this.sheetNo = sheetNo; +// } +// +// public void setQueryDataInterface(QueryDataInterface queryDataInterface) { +// this.queryDataInterface = queryDataInterface; +// } +// +//} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java index f82a656..1a6ff37 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java @@ -42,9 +42,6 @@ public class ProdPlanBatchCompileModel { @ApiParam("班次") private String shiftCode; - @ApiParam("客户名称") - private String custCodeName; - @ApiParam("客户代码") private String custCode; @@ -75,4 +72,52 @@ public class ProdPlanBatchCompileModel { @ApiParam("计划类型名称") private String planTypeName; + @ApiParam("数量1") + private String qty1; + + @ApiParam("完成数量1") + private String completeQty1; + + @ApiParam("数量2") + private String qty2; + + @ApiParam("完成数量2") + private String completeQty2; + + @ApiParam("数量3") + private String qty3; + + @ApiParam("完成数量3") + private String completeQty3; + + @ApiParam("数量4") + private String qty4; + + @ApiParam("完成数量4") + private String completeQty4; + + @ApiParam("数量5") + private String qty5; + + @ApiParam("完成数量5") + private String completeQty5; + + @ApiParam("数量6") + private String qty6; + + @ApiParam("完成数量6") + private String completeQty6; + + @ApiParam("数量7") + private String qty7; + + @ApiParam("完成数量7") + private String completeQty7; + + @ApiParam("合计") + private String amountStr; + + @ApiParam("完成合计") + private String completeAmountStr; + } From f9dfc8e0e21ad11a9f012b495a4a4db27bfb465a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 30 Apr 2020 12:45:10 +0800 Subject: [PATCH 043/134] =?UTF-8?q?plc=E5=9C=B0=E5=9D=80=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0plc=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5(?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE)=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=B7=BB=E5=8A=A0=E4=BD=9C=E4=B8=9A=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=AD=97=E6=AE=B5(=E6=9E=9A=E4=B8=BE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 19d1a22..d1220a7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -97,6 +97,9 @@ public class MesEquipmentModel implements Serializable { @ApiParam("连接类型") private String connectTypeName; + @ApiParam("作业校验模式") + private Integer checkModel; + public MesEquipmentModel() { @@ -139,7 +142,7 @@ public class MesEquipmentModel implements Serializable { } //获取设备分页数据 queryMesEquipmentByPager - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -163,6 +166,7 @@ public class MesEquipmentModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.checkModel = checkModel; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 9ea903c..1e4ee99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -96,6 +96,9 @@ public class MesPlcModel implements Serializable { @ApiParam("OPCUA路径") private String opcUrl; + @ApiParam("PLC类型") + private Integer plcType; + public MesPlcModel() { } @@ -103,7 +106,7 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -131,5 +134,6 @@ public class MesPlcModel implements Serializable { this.device = device; this.objectCode = objectCode; this.opcUrl = opcUrl; + this.plcType = plcType; } } From 345b261118a223687fcb26c0e4dfff0ea941215f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 30 Apr 2020 14:44:57 +0800 Subject: [PATCH 044/134] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BEEQU=5FDEFECT=5FCAUSE=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0,EQU=5FDEFECT=5FMETHOD=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8E=AA=E6=96=BD,EQU=5FDEFECT=5FPHENOMENON?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=8E=B0=E8=B1=A1;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 5 ++++- 1 file changed, 4 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 e126301..88b9646 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 @@ -644,7 +644,10 @@ public class MesEnumUtil { SCRAP("SCRAP", "报废原因"), QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), WC_CHECK("WC_CHECK", "开线检查项"), - BOARD("BOARD", "看板类型"); + BOARD("BOARD", "看板类型"), + EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), + EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), + EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"); private String value; private String description; From 363ac22adeb062d62a7d6dbd4a7a29b9e8ff5c62 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 30 Apr 2020 15:28:54 +0800 Subject: [PATCH 045/134] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1750=20OEE?= =?UTF-8?q?=E8=BF=90=E7=AE=97JOB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesOffLineRecord.java | 30 --------------- .../pojo/mes/model/OperateObjectParamModel.java | 44 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 30 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java 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 6c668db..bc7b401 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 @@ -66,34 +66,4 @@ public class MesOffLineRecord extends BaseBean implements Serializable { @Column(name = "OFF_LINE_TIME") @ApiParam("下线时间") private String offLineTime; - - /*************冗余字段****************/ - - @Transient - @ApiParam("设备代码") - private String equCode; - - @Transient - @ApiParam("运算对象代码") - private String objectCode; - - @Transient - @ApiParam("日期") - private String oeeDate; - - @Transient - @ApiParam("开始时段") - private String startTime; - - @Transient - @ApiParam("结束时段") - private String endTime; - - @Transient - @ApiParam("一次合格数") - private Integer qualifiedQty; - - @Transient - @ApiParam("总生产数") - private Integer totalQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java new file mode 100644 index 0000000..2b25ff8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/30 2:01 下午 + * @Modify: + */ +@Data +public class OperateObjectParamModel { + + private String organizeCode; + + @ApiParam("设备代码") + private String equCode; + + @ApiParam("运算对象代码") + private String objectCode; + + @ApiParam("日期") + private String oeeDate; + + @ApiParam("开始时段") + private String startTime; + + @Transient + @ApiParam("结束时段") + private String endTime; + + @ApiParam("属性值") + private Integer attributeValue = 0; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + +} From 1dff3327d7e69ed2dda5b30fdbd8d5db20635536 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 Apr 2020 17:09:19 +0800 Subject: [PATCH 046/134] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A1733=20?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E6=9D=BF=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 4 ++ .../pojo/mes/model/SnPrintLabelTemplateModel.java | 48 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java 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 80fd5fd..6357830 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 @@ -41,6 +41,10 @@ public class MesProdPack extends BaseBean implements Serializable { @ApiParam("包装规格") private String packSpec; + @Column(name = "PROCESS_LABEL_TEMPLATE") + @ApiParam("过程标签模板") + private String processLabelTemplate; + @Column(name = "PROD_LABEL_TEMPLATE") @ApiParam("产品标签模板") private String prodLabelTemplate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java new file mode 100644 index 0000000..e16935b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 条码打印模版model + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("条码打印模版model") +public class SnPrintLabelTemplateModel { + + @ApiParam("模版信息") + private MesLabelTemplate labelTemplate; + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("条码类型 10-过程条码，20-产品条码，30-包装条码") + private Integer snType; + + @ApiParam("包装条码层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + + public SnPrintLabelTemplateModel() { + } + + public SnPrintLabelTemplateModel(String organizeCode, String partNo, String custCode, Integer snType, Integer packLevel, MesLabelTemplate labelTemplate) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.custCode = custCode; + this.snType = snType; + this.packLevel = packLevel; + this.labelTemplate = labelTemplate; + } +} From 005d0f7f8683c9b160f20d8f76b0b5015162d08d Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Apr 2020 20:36:43 +0800 Subject: [PATCH 047/134] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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/pom.xml | 4 ++-- 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-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- 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 | 4 ++-- 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 +- 20 files changed, 25 insertions(+), 25 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 0cf8b6d..3d6cbc0 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 8debbf6..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0bfac69..3937425 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 b7991cc..e12eaee 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 e0d305b..5bfdd66 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 91f8894..8b15a31 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 3b9e57a..7637865 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-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 4f24980..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index c7bebed..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b5c2cd3..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8767603..23f68bd 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 977c14a..28cf55f 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 dc4ea86..26a7311 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 788be96..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 3930e69..910d630 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 284329f..e5b4e5c 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 8bc1aa2..0ecf190 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 c4793b9..fbbe86f 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 55e4e84..932bdd9 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 6760ed79ddf7110721d857f2662a9f1338bbed58 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 30 Apr 2020 20:46:07 +0800 Subject: [PATCH 048/134] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8=E9=97=AE?= =?UTF-8?q?=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/bean/MesDataAuth.java | 4 ++++ 1 file changed, 4 insertions(+) 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 10f8597..f727900 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 @@ -46,6 +46,10 @@ public class MesDataAuth extends BaseBean implements Serializable { @ApiParam("数据对象") private String dataObject; + @Column(name = "DATA_OBJECT_FULL_NAME") + @ApiParam("数据对象全称") + private String dataObjectFullName; + @Column(name = "DATA_OBJECT_NAME") @ApiParam("数据对象名称") private String dataObjectName; From 40a87d83b3ccb8f72f2c10b56083b664be67e75a Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Apr 2020 20:55:20 +0800 Subject: [PATCH 049/134] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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/pom.xml | 4 ++-- 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-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- 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 | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..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-PROD-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 0cf8b6d..9302dfc 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 8debbf6..a933723 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0bfac69..712a842 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b7991cc..a44418c 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index e0d305b..375d0fd 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 91f8894..d1ea30d 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3b9e57a..50ab2c2 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-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 4f24980..a2bb2df 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index c7bebed..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b5c2cd3..265f98d 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8767603..0080b0c 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 977c14a..24de8cf 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index dc4ea86..0fbfb69 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 788be96..069a4e2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 3930e69..590b56c 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 284329f..ac9e7dd 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 8bc1aa2..f153994 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c4793b9..1bef72c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 1983602b3a4c4a3935f56b08d3f76c0f151d482c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 6 May 2020 09:36:35 +0800 Subject: [PATCH 050/134] =?UTF-8?q?8060=20AP-MGN-BJ-19081=20--=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E6=9F=A5=E8=AF=A2=E8=BE=93=E5=85=A5=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=9B=B6=E4=BB=B6=E6=95=B0=E9=87=8F=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.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/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 8d9a807..17c421d 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 @@ -10,7 +10,11 @@ import lombok.Data; 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.Table; +import javax.persistence.Transient; import java.util.List; @@ -71,7 +75,7 @@ public class WmsTransportRule extends BaseBean { public String partNo; @Column(name = "CUST_NO") - @ApiParam("客户代码") + @ApiParam("客户编号") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String custNo; From 2dac15c248322289ffd391f67ebd24b663daeeea Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 6 May 2020 11:34:06 +0800 Subject: [PATCH 051/134] =?UTF-8?q?=E3=80=901709=20BH-=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=80=BC=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +- .../i3plus/pojo/wms/bean/WmsDocSoDetails.java | 5 ++ .../i3plus/pojo/wms/bean/WmsPartItemCheck.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++ .../i3plus/pojo/wms/bean/WmsTestResultDetails.java | 15 ++++++ .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 1 - .../pojo/wms/modelbean/WmsDataAuthModel.java | 3 ++ .../pojo/wms/modelbean/WmsPartItemCheckModel.java | 53 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 ++++++ 9 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.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 79ea203..cf8e1ea 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 @@ -2244,7 +2244,8 @@ public class WmsEnumUtil { MATERIAL(40, "MATERIAL", "物料对象"), TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"), - BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"); + BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"), + BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"); private String code; private String description; 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 20e8f31..32ce767 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 @@ -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; /** * @Description : 销售订单明细表 @@ -67,4 +68,8 @@ public class WmsDocSoDetails extends BaseBean { @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; + + @Transient + @ApiParam(value = "客户编号") + private String custCode; } 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 8498c36..17ae233 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 @@ -63,7 +63,7 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "STANDARD") @ApiParam("标准值") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double standard; + private Integer standard; @Column(name = "MAX") @ApiParam("最大值") 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 314f299..2a8d3bd 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 @@ -353,6 +353,14 @@ public class WmsStockSn extends BaseBean { @Transient private String requerimentCode; + @Transient + @ApiParam("大检测项类型") + public Integer checkType; + + @Transient + @ApiParam("样本数") + private Integer sampleSize; + public WmsStockSn() { } 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 5329861..a181556 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 检测结果明细表 @@ -64,4 +65,18 @@ public class WmsTestResultDetails extends BaseBean { @Column(name = "check_value") @ApiParam("检测值") public String checkValue; + + @Transient + @ApiParam("已检测数") + private Long checkSize; + + public WmsTestResultDetails() { + } + + public WmsTestResultDetails(String partNo, Integer checkType, String bhCode, Long checkSize) { + this.partNo = partNo; + this.checkType = checkType; + this.bhCode = bhCode; + this.checkSize = checkSize; + } } 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 c928e2b..e564dc9 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 @@ -70,7 +70,6 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "PICK_STATUS") @ApiParam("挑选状态") @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") - public Integer pickStatus; @Column(name = "PICK_RESULT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 9cd45da..29d481e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -48,6 +48,9 @@ public class WmsDataAuthModel extends BaseBean { @ApiParam("业务类型列表") private List busiOperationTypeList; + @ApiParam("检测大类列表") + private List bhCheckTypeList; + @ApiParam( value = "新增操作", example = "0" diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java new file mode 100644 index 0000000..d872ba4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartItemCheckModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 子检测项 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-29 16:23 + * @Modify: + **/ +@Data +@Api("子检测项model") +public class WmsPartItemCheckModel { + + @ApiParam("子检测项代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemCode; + + @ApiParam("子检测项名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemName; + + @ApiParam("子检测箱值类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + private Integer valueType; + + @ApiParam("检测值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double checkValue; + + @ApiParam("是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isQualified; + + @ApiParam("标准值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer standard; + + @ApiParam("最大值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double max; + + @ApiParam("最小值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double min; + +} 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 9be3c1c..86700bb 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 @@ -3204,4 +3204,19 @@ public class WmsHqlPack { return result; } + + /** + * 根据条件分页查询物料检测大类 + * + * @param checkType + * @return + */ + public static DdlPackBean packHqlWmsPartCheckType(WmsPartCheckType checkType) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result); + getStringBuilderPack(checkType, result); + return result; + } } From 28de0251ea814c8b4897f5a77dfc74862229637c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 6 May 2020 17:06:24 +0800 Subject: [PATCH 052/134] =?UTF-8?q?=E3=80=90sonar=20bug=E4=BF=AE=E6=94=B9?= =?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/model/MesWorkOrderModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java index 9fce24b..b7a7eef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -29,7 +29,7 @@ public class MesWorkOrderModel { //客户产线代码 @ApiParam("ProductionLineID") @AnnoOutputColumn - private String workCenterCode; + private String custProdLineCode; //数量 @ApiParam("DemandQty") From 25b2fb8e21c3384664a66cbe8efac0b61e6fc6a3 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 6 May 2020 17:35:04 +0800 Subject: [PATCH 053/134] =?UTF-8?q?jis=20pojo=20=E5=8E=BB=E9=99=A4rule=20?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.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/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index ef7ae49..627f7c1 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 @@ -61,8 +61,8 @@ public class MesPatternJis extends BaseBean implements Serializable { private Integer patternType; @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "MATCH_RULE") + @ApiParam("匹配规则") + private String matchRule; } From 46a91a13bccbf3653411012a10ab6d3db1c6df62 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 6 May 2020 17:35:46 +0800 Subject: [PATCH 054/134] =?UTF-8?q?jis=20=E5=8E=BB=E9=99=A4rule=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.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/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index ef7ae49..bd154b1 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 @@ -61,8 +61,8 @@ public class MesPatternJis extends BaseBean implements Serializable { private Integer patternType; @Lob - @Column(name = "RULE") + @Column(name = "MATCH_RULE") @ApiParam("规则") - private String rule; + private String matchRule; } From 63bc0b5928068ab836dff615f3416aa738ddac26 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 6 May 2020 18:19:17 +0800 Subject: [PATCH 055/134] merge test --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java index b7a7eef..1975440 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -41,4 +41,9 @@ public class MesWorkOrderModel { @AnnoOutputColumn private String startTime; + //开始时间 + @ApiParam("WORK_CENTER_CODE") + @AnnoOutputColumn + private String workCenterCode; + } From f41cd22258734e15b0485da98221d83f14f5b617 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 6 May 2020 19:25:35 +0800 Subject: [PATCH 056/134] =?UTF-8?q?[bug:=208353=20=E6=8B=8D=E7=85=A7?= =?UTF-8?q?=E9=87=87=E9=9B=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java | 2 ++ 6 files changed, 12 insertions(+) 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 98d4fc0..39063b7 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 @@ -10,6 +10,7 @@ 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; import java.math.BigDecimal; @@ -93,6 +94,7 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") 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 0549d1f..49363f3 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 @@ -10,6 +10,7 @@ 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; @@ -84,6 +85,7 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") 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 040228e..ddc37ba 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 @@ -10,6 +10,7 @@ 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; @@ -96,6 +97,7 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") 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 91972fb..f7a2098 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 @@ -11,6 +11,7 @@ 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; @@ -93,6 +94,7 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") 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 acc8c22..bb50de6 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 @@ -10,6 +10,7 @@ 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; @@ -75,6 +76,7 @@ public class IfRawPartData extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") 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 df240bc..221abea 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 @@ -11,6 +11,7 @@ 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; @@ -47,6 +48,7 @@ public class IfWmsPpm extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") + @Lob private String errorMessage; @Column(name = "ACTION_CODE") From b450df5754e419b8e44801c2d5e54b9702716a91 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 6 May 2020 21:05:17 +0800 Subject: [PATCH 057/134] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1752?= =?UTF-8?q?=E5=B7=A5=E5=8E=82oee]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.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/MesOperateObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectCfg.java index cc3a177..a70cac7 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 @@ -25,7 +25,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE") +@Table(name = "MES_OPERATE_OBJECT_CFG") @Api("MES_运算对象属性配置") public class MesOperateObjectCfg extends BaseBean implements Serializable { @@ -62,4 +62,8 @@ public class MesOperateObjectCfg extends BaseBean implements Serializable { @Transient @ApiParam("属性名称") private String attributeName; + + @Transient + @ApiParam("属性类型") + private Integer attributeType; } From 543f0f5c4c684a4d30b6be52df04c1557ea68fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 7 May 2020 09:31:17 +0800 Subject: [PATCH 058/134] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=BF=98=E5=8E=9F=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/MesWorkOrderModel.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java index 1975440..70851a9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -26,10 +26,10 @@ public class MesWorkOrderModel { @AnnoOutputColumn private String partNo; - //客户产线代码 + //产线代码 @ApiParam("ProductionLineID") @AnnoOutputColumn - private String custProdLineCode; + private String workCenterCode; //数量 @ApiParam("DemandQty") @@ -41,9 +41,4 @@ public class MesWorkOrderModel { @AnnoOutputColumn private String startTime; - //开始时间 - @ApiParam("WORK_CENTER_CODE") - @AnnoOutputColumn - private String workCenterCode; - } From f6e2a509f0df7224b6352942ec8bf8e9c63a1842 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 7 May 2020 16:18:32 +0800 Subject: [PATCH 059/134] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1751?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=B0=8F=E6=97=B6OEE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index cdb17df..6ccc9fa 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 @@ -5499,7 +5499,7 @@ public class MesEnumUtil { ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"), ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"), WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"), - EQU_OEE_DAY("EQU_OEE_Day", "设备OEE(天)"); + EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"); private String value; private String description; From ba81a267004e7cc93fb060e4441f73f16b66359b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 7 May 2020 17:06:32 +0800 Subject: [PATCH 060/134] =?UTF-8?q?1778=20=E4=BA=A7=E5=93=81=E5=B7=A5?= =?UTF-8?q?=E8=A3=85=E5=85=B3=E7=B3=BB=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 57 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 8 +++ .../estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 7 +++ 3 files changed, 72 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 06d2317..fb73d5e 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 @@ -6610,4 +6610,61 @@ public class WmsEnumUtil { return valueOf(val); } } + + + /** + * 返修、挑选状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOM_TYPE { + INIT(10, "PART", "物料"), + BE_HANDLE(20, "OUT", "委外"), + FINISH(30, "UTENSIL", "器具"); + + private int value; + private String code; + private String description; + + BOM_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; + } + + 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/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index c87d03b..14d7a05 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 @@ -112,6 +112,14 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; + + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo; 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 6475e26..3456584 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 @@ -115,6 +115,13 @@ public class WmsBomHistory extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String newBomVersion; + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo; From df2e8601c486d16f23dbf7725bd8f43956ec3846 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 7 May 2020 18:50:12 +0800 Subject: [PATCH 061/134] task:1719 --- .../cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java | 8 +------- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 +++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java index 4e90509..f49407c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java @@ -15,13 +15,7 @@ import lombok.Data; @Api("插件日志") public class ScriptLoggerModel { @ApiParam("工厂") - private String organizeCode; - - @ApiParam("用户编号") - private String userCode; - - @ApiParam("脚本编号") - private String scriptNo; + private Boolean error; @ApiParam("日志内容") private String context; 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 792a479..4c77049 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 @@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; +import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; @@ -2279,6 +2280,14 @@ public class WmsHqlPack { return packBean; } + public static DdlPackBean packHqlWmsScriptHistory(EngineScriptPersistenceHistory history) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(history.getScriptNo(), "scriptNo", packBean); + getStringBuilderPack(history, packBean); + + return packBean; + } + /** * 供应商窗口时间 条件封装 * From f87eeeb49129f7a06b2aff4c174381f41ac84bed Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 8 May 2020 13:58:05 +0800 Subject: [PATCH 062/134] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= 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/pom.xml | 4 ++-- 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-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- 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 | 4 ++-- 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 +- 20 files changed, 25 insertions(+), 25 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 3d6cbc0..9302dfc 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 96472ad..a933723 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..712a842 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 e12eaee..a44418c 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 5bfdd66..375d0fd 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 8b15a31..d1ea30d 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 7637865..50ab2c2 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-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index f9957c9..a2bb2df 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 846c302..265f98d 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 23f68bd..0080b0c 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 28cf55f..24de8cf 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 26a7311..0fbfb69 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 1b72275..069a4e2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 910d630..590b56c 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 e5b4e5c..ac9e7dd 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 0ecf190..f153994 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 fbbe86f..1bef72c 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 932bdd9..55e4e84 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 0b3d2d6815db509d0c40737c0ffee30138e869e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 8 May 2020 14:34:29 +0800 Subject: [PATCH 063/134] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8DREST=20?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=99=A8=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 9 +++++++++ .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java | 1 + .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 3 +++ 3 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 3b2e47c..cb371c4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -8,6 +8,10 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; import java.util.List; import java.util.Map; @@ -20,9 +24,12 @@ import java.util.Map; **/ @Data @XStreamAlias("server") +@XmlRootElement(name ="server") +@XmlAccessorType(XmlAccessType.NONE) public class SuitServerModel { // 执行方法命令 + @XmlElement @ApiParam(value = "适配器code") private String suitCaseCode; /* 认证使用 以后使用 */ @@ -31,6 +38,7 @@ public class SuitServerModel { // 请求ID private String requestId; // 传输单对象 + @XmlElement(name = "data") private Object obj; // 传输集合 private List list; @@ -44,6 +52,7 @@ public class SuitServerModel { */ // @XStreamImplicit @XStreamCDATA + @XmlElement private String suitMessage; /** diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java index da487e2..4f87d41 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value = "长数据", description = "长数据") public class BsLongData extends BaseBean { + private static final long serialVersionUID = -329128754646765129L; @Column(name = "REF_ID") @ApiParam(value = "关联id") private Long refId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index fad903c..051d0c9 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; @@ -40,6 +42,7 @@ public class BsSuitCaseREST extends BaseBean { //CommonEnumUtil.HTTP_METHOD_TYPE @Column(name = "REQUEST_METHOD_ID") @ApiParam(value = "请求方式id") + @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; @Transient From eadf0d67f8ffa6eddac8b4118b83f5f018a3cd08 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Fri, 8 May 2020 14:49:26 +0800 Subject: [PATCH 064/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/bean/DdlPackBean.java | 19 ++++++++ .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 54 ++++++++-------------- .../estsh/i3plus/pojo/mes/model/FilterGroup.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/FilterRule.java | 2 +- .../{FilterRuleAndOr.java => FilterRules.java} | 2 +- 5 files changed, 41 insertions(+), 38 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{FilterRuleAndOr.java => FilterRules.java} (83%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index ded0d8d..c397de1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import java.util.HashMap; +import java.util.Map; /** * @Description : hql脚本封装类 @@ -141,6 +142,24 @@ public class DdlPackBean { } /** + * 添加查询条件-处理多个属性 + * @param hql + * @param hqlMap + */ + public void addColumnQuery(String hql,HashMap hqlMap){ + if(hqlPreparedMap == null){ + hqlPreparedMap = new HashMap<>(); + } + if(hqlMap != null && !hqlMap.isEmpty()) { + hqlPreparedMap.putAll(hqlMap); + } + + whereAppend.append(hql); + } + + + + /** * 需要查询属性的数量 * @return */ 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 cdb17df..6967548 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 @@ -14,26 +14,26 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_EXPRESSION { - GT(10,">","大于"), - LT(20,"<","小于"), - EQ(30,"=","等于"), - NEQ(40,"!=","不等于"), - GTE(50,">=","大于等于"), - LTE(60,"<=","小于等于"), - LIKE(70,"like","LIKE"), - IN(80,"in","包含"); + GT(">",">","大于"), + LT("<","<","小于"), + EQ("=","=","等于"), + NEQ("!=","!=","不等于"), + GTE(">=",">=","大于等于"), + LTE("<=","<=","小于等于"), + LIKE("like","like","LIKE"), + IN("in","in","包含"); - private int value; + private String value; private String code; private String description; - HQL_EXPRESSION(int value, String code, String description) { + HQL_EXPRESSION(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -45,38 +45,22 @@ public class MesEnumUtil { 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 codeOf(int val) { - String tmp = null; + public static String valueOfDesc(String val) { for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; + if (values()[i].value.equals(val)) { + return values()[i].description; } } - return tmp; + return null; } - public static int descOf(String desc) { - int tmp = 1; + public static HQL_EXPRESSION codeOf(String value) { for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; + if (values()[i].value.equals(value)) { + return values()[i]; } } - return tmp; - } - - public static String valueOfDescription(int val) { - return valueOf(val); + return null; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java index a262480..2834455 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java @@ -7,5 +7,5 @@ import java.util.List; @Data public class FilterGroup { private String andOr; - private List groups; + private List groups; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java index 0d91df9..d38f6c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class FilterRule { - private String filed; + private String field; private String op; private String value; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java similarity index 83% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java index 1991cfd..1a74bdf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRules.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.List; @Data -public class FilterRuleAndOr { +public class FilterRules { private String andOr; private List rules; } From ef6330675c7957fb4bf91524611a99ad61aa5045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 8 May 2020 17:42:53 +0800 Subject: [PATCH 065/134] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#1744=EF=BC=9A?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=9B=BF=E6=8D=A2=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/annotation/DynamicField.java | 14 +- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 76 +++++----- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 108 +++++++++++++++ .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 144 ++++--------------- .../cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 10 ++ .../cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 21 ++- .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 14 ++ .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 4 +- .../estsh/i3plus/pojo/wms/bean/QadItemPacking.java | 4 +- .../java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java | 11 +- .../pojo/wms/bean/SwebProcurementPlanOrder.java | 16 +++ .../cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 16 +-- .../estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 27 ++++ .../pojo/wms/bean/WmsBhChildDetectionItem.java | 10 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 30 ++-- .../estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 32 ++--- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 52 ++++--- .../i3plus/pojo/wms/bean/WmsContainerType.java | 9 +- .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 44 +++--- .../i3plus/pojo/wms/bean/WmsCustomerPart.java | 20 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 10 +- .../i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 18 +-- .../i3plus/pojo/wms/bean/WmsDockWindowTime.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java | 13 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 47 ++++--- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 17 +++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 44 ++++++ .../estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 22 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 153 +++++++++++---------- .../i3plus/pojo/wms/bean/WmsPartCheckType.java | 12 +- .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 50 +++---- .../estsh/i3plus/pojo/wms/bean/WmsPartGroup.java | 4 + .../i3plus/pojo/wms/bean/WmsPartItemCheck.java | 20 +-- .../estsh/i3plus/pojo/wms/bean/WmsPartPackage.java | 8 +- .../estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 11 +- .../i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 16 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 29 +++- .../cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java | 8 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsShift.java | 6 + .../i3plus/pojo/wms/bean/WmsShippingFlag.java | 17 +++ .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 7 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 79 ++++++++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java | 10 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTerminal.java | 8 +- .../estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java | 10 ++ .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 39 ++++++ .../i3plus/pojo/wms/bean/WmsTransportRule.java | 23 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 5 + .../estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 5 + .../estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 25 +++- .../estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 15 ++ .../i3plus/pojo/wms/bean/WmsWorkCenterZone.java | 21 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java | 17 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 40 +++--- .../pojo/wms/bean/dynamictable/WmsFieldInfo.java | 30 ++-- .../pojo/wms/bean/dynamictable/WmsListElement.java | 4 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 58 files changed, 1001 insertions(+), 516 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 9dfac91..2811481 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.base.annotation; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import java.lang.annotation.*; @@ -12,7 +12,7 @@ import java.lang.annotation.*; @Target({ElementType.FIELD, ElementType.TYPE}) public @interface DynamicField { // Web前端字段数据类型 - WmsEnumUtil.FIELD_TYPE webFieldType(); + CommonEnumUtil.FIELD_TYPE webFieldType(); // 条件表达式:>,<,>=等 String conditionExpre() default "="; // 条件连接符:and/or @@ -35,14 +35,16 @@ public @interface DynamicField { int isShow() default 1; // 是否跳过本字段扫描 0-不跳过，1-跳过 int isSkip() default 0; - // 下拉枚举名称 - String entityName() default ""; // 下拉列表显示列名称,多个列名需要根据逗号分隔 String listColumnName() default ""; // 下拉搜索列名称,多个列名需要根据逗号分隔 String searchColumnName() default ""; // 回显列名 String explicitColumnName() default ""; - // 下拉框规则 - WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM; + // 是否多选:1-多选，默认2-单选 + int isMultiple() default 2; + // 数据来源 + String dataSrc() default ""; + // 取值方式 + CommonEnumUtil.DYNAMIC_FIELD_GET_WAY getValWay() default CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.ENUM; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 6506c66..69c6cd1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -37,99 +37,97 @@ public abstract class BaseBean implements Serializable { @Id @GeneratedValue(generator = "IDGenerator") @GenericGenerator(name = "IDGenerator", strategy = "assigned") - @Column(name="ID") - @ApiParam(value = "主键",example = "0") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) public Long id; //get单独处理 public Long getId() { - if(id != null) { + if (id != null) { return id.longValue(); - }else{ + } else { return id; } } /** * MonogoDB _id映射 + * * @param id */ - @JSONField(name="_id") + @JSONField(name = "_id") public void setId(Long id) { this.id = id; } - @Column(name="ORGANIZE_CODE", nullable = false) - @ApiParam(value ="组织代码") + @Column(name = "ORGANIZE_CODE", nullable = false) + @ApiParam(value = "组织代码") // @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) public String organizeCode; - @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) - @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @Column(name = "IS_VALID", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "有效性", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; - @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) - @ApiParam(value = "是否已删除",example = "2") + @Column(name = "IS_DELETED", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否已删除", example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA - @Column(name="CREATE_USER",updatable = false) + @Column(name = "CREATE_USER", updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") public String createUser; @Indexed(direction = IndexDirection.DESCENDING) - @Column(name="CREATE_DATE_TIME",updatable = false) + @Column(name = "CREATE_DATE_TIME", updatable = false) @ApiParam(value = "创建日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String createDatetime; - @Column(name="MODIFY_USER") + @Column(name = "MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list", - listColumnName = "name", explicitColumnName = "name") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") public String modifyUser; - @Column(name="MODIFY_DATE_TIME") + @Column(name = "MODIFY_DATE_TIME") @ApiParam(value = "修改日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String modifyDatetime; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeEnd; - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "修改日期查询用，查询起始日期", example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "修改日期查询用，查询结束日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeEnd; @Transient @@ -138,19 +136,19 @@ public abstract class BaseBean implements Serializable { public String orderByParam = ""; @Transient - @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1") @AnnoOutputColumn(hidden = true) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; //排序方式 - public String orderBy(){ + public String orderBy() { String result = ""; - if (orderByParam!=null&&orderByParam.trim().length()>0) { + if (orderByParam != null && orderByParam.trim().length() > 0) { result = " order by " + orderByParam; - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; - }else{ + } else { result += " desc"; } } 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 00f6f1b..e6bb72a 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 @@ -2175,4 +2175,112 @@ public class CommonEnumUtil { return tmp; } } + + /** + * PC自定义搜索-字段类型 + * 10-文本，20-数字，30-下拉框，40，时间，50-开窗 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FIELD_TYPE { + TEXT(10, "text"), NUMBER(20, "number"), + SELECT(30, "select"), DATETIME(40, "datetime"), + LIST(50, "list"); + + private int value; + private String description; + + FIELD_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 static FIELD_TYPE codeOf(Integer value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + } + + /** + * PC自定义搜索-取值方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_FIELD_GET_WAY { + ENUM(10, "SINGLE_OBJ", "枚举"), + OBJ(20, "MULTIPLE_OBJ", "对象"), + URL(30, "SINGLE_OBJ", "接口"); + + private int value; + private String code; + private String description; + + DYNAMIC_FIELD_GET_WAY(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 DYNAMIC_FIELD_GET_WAY 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; + } + + 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; + } + } + } 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 57e81fc..d57e601 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 @@ -139,6 +139,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2989,6 +2990,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -3176,6 +3178,7 @@ public class WmsEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -3189,7 +3192,10 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } - public static int descriptionOfValue(String desc) {return descOf(desc);} + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } } @@ -4199,7 +4205,8 @@ public class WmsEnumUtil { } } - /**分类 + /** + * 分类 * 物流规则 处理单位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4363,7 +4370,7 @@ public class WmsEnumUtil { /** - * 日志推送至MQ的处理类型 + * 规格层级 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SPEC_LEVEL { @@ -4935,51 +4942,6 @@ public class WmsEnumUtil { } /** - * WEB页面字段类型 - * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FIELD_TYPE { - TEXT(10, "text"), NUMBER(20, "number"), - SELECT(30, "select"), DATETIME(40, "datetime"), - LIST(50, "list"); - - private int value; - private String description; - - FIELD_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 static FIELD_TYPE codeOf(Integer value) { - for (int i = 0; i < values().length; i++) { - if (values()[i].value==value) { - return values()[i]; - } - } - return null; - } - } - - /** * 推送类型单位 * 默认为 10 */ @@ -5053,6 +5015,7 @@ public class WmsEnumUtil { } return tmp; } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -5066,7 +5029,10 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } - public static int descriptionOfValue(String desc) {return descOf(desc);} + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } } /** @@ -5239,7 +5205,7 @@ public class WmsEnumUtil { } /** - * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 + * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -5301,70 +5267,7 @@ public class WmsEnumUtil { } /** - * 动态查询-下拉框规则 - * 默认为 10 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DYNAMIC_FIELD_SELECT_RULE { - SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"), - MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"), - SINGLE_URL(30, "SINGLE_URL", "单选接口"), - MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口"); - - private int value; - private String code; - private String description; - - DYNAMIC_FIELD_SELECT_RULE(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 DYNAMIC_FIELD_SELECT_RULE 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; - } - - 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; - } - } - - /** - * 波次合并规则 + * 波次合并规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { @@ -5448,7 +5351,7 @@ public class WmsEnumUtil { } /** - * 波次合并规则 + * 波次合并规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { @@ -5563,7 +5466,7 @@ public class WmsEnumUtil { } /** - * 插件类型 10-合并规则，20-合并范围 + * 插件类型 10-合并规则，20-合并范围 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_TYPE { @@ -5806,7 +5709,7 @@ public class WmsEnumUtil { return null; } - public static String valueOfDescription ( int val){ + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -5822,7 +5725,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QAD_DOC_TYPE { - TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + TYPE_S(10, "s", "s"), TYPE_D(20, "d", "d"); private int value; private String code; @@ -5832,7 +5735,7 @@ public class WmsEnumUtil { return code; } - QAD_DOC_TYPE(int value,String code, String description) { + QAD_DOC_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -5898,6 +5801,7 @@ public class WmsEnumUtil { } return null; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -6383,7 +6287,7 @@ public class WmsEnumUtil { private String code; private String description; - PURCHASE_PLAN_HISTORY_STATUS(int value, String code,String description) { + PURCHASE_PLAN_HISTORY_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; 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 60cabe4..2ea88ea 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 @@ -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; @@ -31,33 +33,41 @@ public class BasCustomer extends BaseBean { private static final long serialVersionUID = -1980207700343546396L; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custNo; @Column(name = "CUST_NAME") @ApiParam(value = "客户简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custName; @Column(name = "CUST_DESC") @ApiParam(value = "客户全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custDesc; @Column(name = "CUST_ADDR") @ApiParam(value = "客户地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custAddr; @Column(name = "CUST_OWNER") @ApiParam(value = "联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custOwner; @Column(name = "CUST_EMAIL") @ApiParam(value = "邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custEmail; @Column(name = "CUST_TEL") @ApiParam(value = "电话号码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custTel; @Column(name = "CUST_FAX") @ApiParam(value = "传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custFax; } 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 ebf9603..a0a1765 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 @@ -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; @@ -31,14 +33,17 @@ public class BasVendor extends BaseBean{ private static final long serialVersionUID = 9214639813072592779L; @Column(name="VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorNo; @Column(name="VENDOR_NAME") @ApiParam("供应商简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorName; @Column(name="VENDOR_DESC") @ApiParam("供应商全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String vendorDesc; @Column(name="VENDOR_ADDR") @@ -47,50 +52,64 @@ public class BasVendor extends BaseBean{ @Column(name="VENDOR_OWNER") @ApiParam("联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorOwner; @Column(name="VENDOR_EMAIL") @ApiParam("邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorEmail; @Column(name = "IS_ASN") @ApiParam(value = "是否发ASN", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isAsn; @Column(name = "USER_NAME") @ApiParam(value = "用户名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName") private String userName; @Column(name = "PASSWORD") @ApiParam(value = "密码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String password; @Column(name = "VENDOR_CALL") @ApiParam("供应商电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorCall; @Column(name = "VENDOR_FAX") @ApiParam("传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorFax; @Column(name = "VENDOR_PHONE") @ApiParam("手机") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorPhone; @Column(name = "KILOBIT") @ApiParam("千位符号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String kilobit; @Column(name = "DECIMALS") @ApiParam("小数位符号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String decimals; - //20-承运商 @Column(name = "VENDOR_TYPE") + @ApiParam("供应商类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "VENDOR_TYPE") private Integer vendorType; @Column(name = "MAP_LOCATION") @ApiParam("经纬度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; public BasVendor() { 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 8ec1cae..2eb3864 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 @@ -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; @@ -32,34 +34,46 @@ public class MesPpMaster extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String woekorderNo; @Column(name="PDLINE_NO") @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 = "workCenterCode") private String pdlineNo; @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String planProductTime; @Column(name="SHIFT_NO") @ApiParam("班次代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shitNo; @Column(name="START_PRODUCT_TIME") @ApiParam("开始生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String startProductTime; @Column(name="END_PRODUCT_TIME") @ApiParam("结束生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String endProductTime; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_MASTER_STATUS") private Integer orderStatus = 0; @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq = 0; public Integer getOrderStatus() { 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 59f3f84..1e942f7 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 @@ -2,7 +2,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.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -41,7 +41,7 @@ public class QadBop implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 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 dfe4dab..b1433df 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 @@ -2,7 +2,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.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -40,7 +40,7 @@ public class QadItemPacking implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 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 e33e3c1..4de7f0e 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 @@ -2,7 +2,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.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -13,12 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -45,7 +40,7 @@ public class SodDet implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 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 338d1d1..6069c18 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 @@ -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; @@ -31,26 +33,40 @@ public class SwebProcurementPlanOrder extends BaseBean { private static final long serialVersionUID = -4332932784803175933L; @Column(name = "ORDER_NO") @ApiParam(value = "合同号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; @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 vendorCode; @Column(name = "VENDOR_NAME") @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 = "vendorName") private String vendorName; @Column(name = "PART_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.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partName; @Column(name = "CONSIGNMENT") @ApiParam(value = "是否寄售") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer consignment=2; } 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 2bbb7c8..55e2498 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,37 +35,37 @@ public class WareHouse extends BaseBean { private static final long serialVersionUID = 7914396535326597148L; @Column(name = "CODE") @ApiParam("仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String code; @Column(name = "NAME") @ApiParam("仓库名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String name; @Column(name = "ADDRESS") @ApiParam("仓库地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String address; @Column(name = "WH_LENGTH") @ApiParam(value = "长(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whLength; @Column(name = "WH_WIDTH") @ApiParam(value = "宽(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whWidth; @Column(name = "WH_HEIGHT") @ApiParam(value = "高(单位：全局设置参数中的基本单元)") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer whHeight; @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)") @ApiParam(value = "基本单元（米）") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double baseUnit; @Column(name = "MAP_LOCATION") 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 a852b02..015f5ed 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 @@ -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; @@ -32,38 +34,63 @@ public class WmsAreaOwner extends BaseBean { private static final long serialVersionUID = -5772266802563087135L; @Column(name = "WH_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.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name="PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") public String partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") public String partNameRdd; @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 vendorNo; @Column(name = "OWNER_USER_NO") @ApiParam(value = "负责人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName") private String ownerUserNo; @Column(name = "IS_PRE_ASSIGN") @ApiParam(value = "是否预分配人员") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isPreAssign; @Column(name="SHIFT_NO") @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shiftNo; @Transient 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 e157150..6be1fbb 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,21 +32,21 @@ public class WmsBhChildDetectionItem extends BaseBean { @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") private Integer checkType; @Column(name = "ITEM_CHECK_CODE") @ApiParam("子检测项代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemCheckCode; @Column(name = "ITEM_CHECK_NAME") @ApiParam("子检测项名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemCheckName; @Column(name = "VALUE_TYPE") @ApiParam("值类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") private Integer valueType; } 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 c87d03b..fcbabcf 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 @@ -3,7 +3,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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -37,61 +37,61 @@ public class WmsBom extends BaseBean { private static final long serialVersionUID = 5555657644784074446L; @Column(name = "PART_NO") @ApiParam(value = "父物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "父物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "UNIT") @ApiParam(value = "计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Column(name = "ITEM_PART_NO") @ApiParam(value = "子物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNo; @Column(name = "ITEM_PART_NAM") @ApiParam(value = "子料物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNam; @Column(name = "ITEM_UNIT") @ApiParam(value = "子计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemUnit; @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double itemQty; @Column(name = "BOM_NUM") @ApiParam(value = "BOM编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomNum; @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_START_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effStartTime; @@ -99,17 +99,17 @@ public class WmsBom extends BaseBean { @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_END_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effEndTime; @Column(name = "LOCATE_NO") @ApiParam(value = "线边库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String locateNo; @Column(name = "TERMINAL_NO") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; @ApiParam(value = "目标存储区") 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 6475e26..1616169 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 @@ -3,7 +3,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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -35,61 +35,61 @@ import javax.persistence.Transient; public class WmsBomHistory extends BaseBean { @Column(name = "PART_NO") @ApiParam(value = "父物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "父物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "UNIT") @ApiParam(value = "计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Column(name = "ITEM_PART_NO") @ApiParam(value = "子物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNo; @Column(name = "ITEM_PART_NAM") @ApiParam(value = "子料物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String itemPartNam; @Column(name = "ITEM_UNIT") @ApiParam(value = "子计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemUnit; @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") @ColumnDefault("0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double itemQty; @Column(name = "BOM_NUM") @ApiParam(value = "BOM编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomNum; @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String bomVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_START_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effStartTime; @@ -97,22 +97,22 @@ public class WmsBomHistory extends BaseBean { @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_END_TIME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String effEndTime; @Column(name = "LOCATE_NO") @ApiParam(value = "线边库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String locateNo; @Column(name = "TERMINAL_NO") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; @Column(name = "NEW_BOM_VERSION") @ApiParam(value = "工位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String newBomVersion; @ApiParam(value = "目标存储区") 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 6c8b97a..f32d795 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 @@ -1,7 +1,9 @@ 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; @@ -12,7 +14,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 车辆信息 @@ -26,43 +27,60 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_CAR") +@Table(name = "WMS_CAR") @Api("车辆信息") public class WmsCar extends BaseBean { - @Column(name="CAR_NO") - @ApiParam(value ="车牌号") + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String carNo; - @Column(name="CAR_DESC") - @ApiParam(value ="车辆描述") + @Column(name = "CAR_DESC") + @ApiParam(value = "车辆描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String carDesc; - @Column(name="MAX_CAPACITY") - @ApiParam(value ="载重量(KG)") + @Column(name = "MAX_CAPACITY") + @ApiParam(value = "载重量(KG)") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String maxCapacity; - @Column(name="DRIVER_NO") - @ApiParam(value ="默认驾驶员") + @Column(name = "DRIVER_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.WmsTmsDriver", + searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverNo") private String driverNo; - @Column(name="PHONE") - @ApiParam(value ="车主电话") + @Column(name = "PHONE") + @ApiParam(value = "车主电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String phone; - @Column(name="VENDOR_NO") - @ApiParam(value ="所属供应商") + @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 vendorNo; - @Transient - @ApiParam("司机名称") + @Column(name = "DRIVER_NAME_RDD") + @ApiParam("驾驶员名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver", + searchColumnName = "driverNo,driverName", listColumnName = "driverNo,driverName", explicitColumnName = "driverName") private String driverNameRdd; - @Transient + @Column(name = "VENDOR_NAME_RDD") @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 = "vendorName") private String vendorNameRdd; @Column(name = "MAP_LOCATION") @ApiParam("经纬度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; } 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 3c51124..5529e33 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 @@ -1,20 +1,20 @@ 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; 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; /** * @Description :容器类型 @@ -33,22 +33,27 @@ import javax.persistence.Transient; public class WmsContainerType extends BaseBean { private static final long serialVersionUID = 4849044986767609347L; @ApiParam(value = "容器类型代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctCode; @Column(name = "CT_NAME") @ApiParam(value = "容器类型名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctName; @Column(name = "USE_LIMIT") @ApiParam(value = "使用期限") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private Integer useLimit; @Column(name = "IS_RECYCLE") @ApiParam(value = "是否回收") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isRecycle; @Column(name = "LIMIT_UOM") @ApiParam(value = "期限单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String limitUom; } 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 a6845a4..4ceaa41 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 @@ -3,6 +3,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; @@ -37,77 +38,86 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @Column(name = "STRATEGY_NAME") @ApiParam(value = "策略名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String strategyName; @Column(name = "part_type") @ApiParam(value = "物料分类") @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC") private String partType; @Column(name = "STRATEGY_TYPE") @ApiParam(value = "策略分类", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "CS_STRATEGY_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class) private Integer strategyType; @Column(name = "CYCLE_RULE") @ApiParam(value = "循环规则") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String cycleRule; @Column(name = "START_DATE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "开始日期", example = "0") private String startDate; @Column(name = "END_DATE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "结束日期", example = "0") private String endDate; @Column(name = "NUM_MAX") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @ApiParam(value = "明细数量上限") private Integer numMax; @Column(name = "COVERAGE_RATE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) @ApiParam(value = "抽盘覆盖率") private Double coverageRate; @Column(name = "ZONE_NOS") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "存储区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNos; @Column(name = "LOCATES") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "盘点库位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locates; @Column(name = "last_run_time") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "上次运行时间") private String lastRunTime; @Column(name = "next_run_time") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @ApiParam(value = "下次运行时间") private String nextRunTime; @Column(name = "REMAKE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) @ApiParam(value = "备注") private String remake; - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "已盘物料") - @Column(name="INVENTORY_MATERIAL") + @Column(name = "INVENTORY_MATERIAL") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String inventoryMaterial; - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "已盘库位") - @Column(name="INVENTORY_LOCATION") - private String inventoryLocation; + @Column(name = "INVENTORY_LOCATION") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + private String inventoryLocation; } 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 6e25a2b..3e7e870 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 @@ -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; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 客户零件关系表 @@ -32,21 +33,34 @@ public class WmsCustomerPart extends BaseBean { private static final long serialVersionUID = 3903166651913139058L; @Column(name = "CUSTOMER_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.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String customerCode; @Column(name = "PART_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.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "CUSTOMER_PART_NO") @ApiParam(value = "客户零件号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String customerPartNo; - @Transient + @Column(name = "CUSTOMER_DESC") @ApiParam(value = "客户全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custDesc") private String custDesc; - @Transient + @Column(name = "PART_NAME") @ApiParam(value ="物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partName; } 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 2f2f3f9..4686917 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,21 +31,21 @@ import javax.persistence.Table; public class WmsDock extends BaseBean { @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockCode; @Column(name="DOCK_ADDRESS") @ApiParam("道口发运地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockAddress; @Column(name="DOCK_DESC") @ApiParam("道口发运地址描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockDesc; @Column(name="DOCK_TYPE") @ApiParam("道口类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_TYPE") private Integer dockType; } 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 b7e6d03..3c8d44e 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,42 +33,42 @@ public class WmsDockOrderInfo extends BaseBean { @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String dockCode; @Column(name="ORDER_DATE") @ApiParam("预约日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String orderDate; @Column(name="WINDOW_TIME") @ApiParam("窗口时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String windowTime; @Column(name="ORDER_STATUS") @ApiParam("预约状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "DOCK_ORDER_STATUS") private Integer orderStatus; @Column(name="SUPPLIER_CODE") @ApiParam("供应商编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String supplierCode; @Column(name="CAR_NO") @ApiParam("车辆编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String carNo; @Column(name="DRIVER_NAME") @ApiParam("驾驶员") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String driverName; @Column(name="ORDER_NO") @ApiParam("单据号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; @Transient 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 0084679..acdd899 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,11 +32,11 @@ public class WmsDockWindowTime extends BaseBean { @Column(name="DOCK_CODE") @ApiParam("道口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String dockCode; @Column(name="WINDOW_TIME") @ApiParam("窗口时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String windowTime; } 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 9b7661f..3e63579 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 @@ -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 com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -33,32 +35,43 @@ public class WmsIbCheckPlan extends BaseBean{ private static final long serialVersionUID = 3557978060450659460L; @Column(name="PART_NO") @ApiParam(value ="物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name="START_DATE") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="开始日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startDate; @Column(name="END_DATE") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="结束日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endDate; @Column(name="LOT_QTY") @ApiParam(value ="样本数量", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer lotQty; @Column(name="COUNTER") @ApiParam(value ="已收货件数", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer counter; @Column(name="CHECK_COUNTER") @ApiParam(value ="已抽点件数", example = "-1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer checkCounter; @Transient 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 a69e24b..dc5f9e6 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 @@ -3,6 +3,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; @@ -35,12 +36,12 @@ public class WmsLocate extends BaseBean { private static final long serialVersionUID = -8425904594036746967L; @Column(name = "LOCATE_NO") @ApiParam(value = "库位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String locateNo; @Column(name = "LOCATE_NAME") @ApiParam(value = "库位名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String locateName; /** @@ -49,104 +50,106 @@ public class WmsLocate extends BaseBean { @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LOCATE_TYPE") private Integer locateType; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "FURNITURE_NO") @ApiParam(value = "家具代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String furnitureNo; @Column(name = "X") @ApiParam(value = "X", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer x; @Column(name = "Y") @ApiParam(value = "Y", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer y; @Column(name = "Z") @ApiParam(value = "Z", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer z; @Column(name = "LC_LENGTH") @ApiParam(value = "长") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcLength; @Column(name = "LC_WIDTH") @ApiParam(value = "宽") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcWidth; @Column(name = "LC_HEIGHT") @ApiParam(value = "高") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer lcHeight; @Column(name = "SEQ") @ApiParam(value = "序号", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq; @Column(name = "STATUS") @ApiParam(value = "库位状态", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "LOCATE_STATUS") private Integer status; @Column(name = "MAX_PACKAGE_QTY") @ApiParam(value = "最大包装数量", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer maxPackageQty; @Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大零件数量", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double maxPartQty; @Column(name = "STOCK_UNIT") @ApiParam(value = "存放单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockUnit; @Column(name = "LINE_CODE") @ApiParam(value = "生产线") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String lineCode; @Column(name = "BOX_QTY") @ApiParam(value = "箱数", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer boxQty; @Column(name = "PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "零件数", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double partQty; @Column(name = "ENCRYPTION_NO") @ApiParam(value = "加密编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String encryptionNo; @Column(name = "LAST_CS_TIME") @ApiParam(value = "末次盘点时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastCsTime; @Column(name = "POSITION") 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 c4b5956..47d5248 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 @@ -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; @@ -32,38 +34,53 @@ public class WmsLocatePart extends BaseBean { private static final long serialVersionUID = 9134745988014340144L; @Column(name = "LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double pullQty; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "IS_GENERATE_PICKLIST") @ApiParam(value = "是否生成领料单", example = "2") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isGeneratePicklist; @Column(name = "SAFETY_STOCK", columnDefinition = "decimal(18,8)") @ApiParam(value = "安全库存", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double safetyStock; @Column(name = "MOQ", columnDefinition = "decimal(18,8)") @ApiParam(value = "起订量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double moq; @Transient 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 d221a61..87ab093 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 @@ -1,7 +1,9 @@ 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; @@ -37,41 +39,58 @@ public class WmsMoveDetails extends BaseBean { private static final long serialVersionUID = -5898637337319011710L; @Column(name = "ORDER_NO") @ApiParam("单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String orderNo; @Column(name = "ITEM") @ApiParam(value = "行号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Integer item; @Column(name = "PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") public String partNo; @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") public String partNameRdd; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") + @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") public String vendorNo; @Column(name = "CUST_NO") @ApiParam("客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") public String custNo; @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "处理数量", example = "0") @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double transQty; @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "已处理数量", example = "0") @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double handledQty; @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "不合格处理数量", example = "0") @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double rejectQty; public Double getRejectQty() { @@ -80,30 +99,49 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "UNIT") @ApiParam("单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String unit; @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") public String srcWhNo; @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String srcZoneNo; @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String srcLocateNo; @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") public String destWhNo; @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") public String destZoneNo; @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, +dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") public String destLocateNo; /** @@ -112,10 +150,12 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "0") @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_STATUS") public Integer itemStatus; @Column(name = "REF_ITEM") @ApiParam("关联单据行号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refItem; /** @@ -123,14 +163,17 @@ public class WmsMoveDetails extends BaseBean { */ @Column(name = "REF_TYPE") @ApiParam("关联单据类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE") public String refType; @Column(name = "REF_SRC") @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; @Column(name = "GROUP_NO") @ApiParam("分组号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String groupNo; @ApiParam(value = "待出库数量", example = "0") @@ -200,6 +243,7 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "CONSIGNATION") @ApiParam("是否寄售 1-是 2-否") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer consignation = 2; public Integer getIsSnapshot() { 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 71eb010..702df84 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 @@ -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; @@ -11,14 +13,13 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** - * @Description :容器类型 + * @Description :包装规格 * @Reference : - * @Author : 容器类型 + * @Author : * @CreateDate : 2019-11-07 16:06 - * @Modify: + * @Modify: 2020-04-27 修改头部描述-dragon **/ @Data @Entity @@ -30,34 +31,45 @@ import javax.persistence.Transient; public class WmsPackageSpec extends BaseBean { private static final long serialVersionUID = 4849044986767609445L; @ApiParam(value = "包装规格代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String specCode; @Column(name = "SPEC_NAME") @ApiParam(value = "包装规格名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String specName; @Column(name = "QTY") @ApiParam(value = "包装数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qty; @Column(name = "PARENT_SPEC") @ApiParam(value = "上级规格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode") private String parentSpec; @Column(name = "SPEC_LEVEL") @ApiParam(value = "规格层级") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SPEC_LEVEL") private Integer specLevel; @Column(name = "IS_MIXED") @ApiParam(value = "是否混包") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isMixed; @Column(name = "POCKET_TYPE") @ApiParam(value = "容器类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/wms/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode") private String pocketType; @ApiParam(value = "上级规格名称") - @Transient + @Column(name = "PARENT_NAME") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName") private String parentName; } 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 58f5123..77039cd 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 @@ -3,6 +3,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; @@ -32,237 +33,239 @@ import javax.persistence.*; @Api("物料表") public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; + @Column(name = "PART_NO") @ApiParam(value = "物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; - @Column(name = "PART_SPEC") - @ApiParam(value = "物料规格") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - private String partSpec; + @Column(name = "PART_TYPE_DESC") + @ApiParam(value = "物料类型描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partTypeDesc; @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_PART_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class) private String partType; - @Column(name = "PART_TYPE_DESC") - @ApiParam(value = "物料类型描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) - private String partTypeDesc; + @Column(name = "STOCK_UNIT") + @ApiParam(value = "库存单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + private String stockUnit; + + @Column(name = "IN_LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + private String inLocateNo; + + @Column(name = "SNP", columnDefinition = "decimal(18,8)") + @ApiParam(value = "标包", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double snp; + + @ColumnDefault("2") + @Column(name = "IQC") + @ApiParam(value = "是否免检", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") + private Integer iqc; + + @Column(name = "PART_SPEC") + @ApiParam(value = "物料规格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partSpec; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String color; - @Column(name = "STOCK_UNIT") - @ApiParam(value = "库存单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") - private String stockUnit; - @Column(name = "ABC") @ApiParam(value = "分类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double pu2su; - @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam(value = "标包", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double snp; - - @ColumnDefault("2") - @Column(name = "IQC") - @ApiParam(value = "是否免检", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") - private Integer iqc; - @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String lotCheckRule; @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer snControl; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorNo; - @Column(name = "IN_LOCATE_NO") - @ApiParam(value = "默认入库库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") - private String inLocateNo; - @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + @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 outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, - isRequire = 2, entityName = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @Transient @ApiParam("总数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; @Column(name = "verb_num") @ApiParam(value = "单次拆包数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double verbNum; @Column(name = "IS_PROD_LOT") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM, - isRequire = 2, entityName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, isRequire = 2, dataSrc = "PULL_WAY_STATUS") @ApiParam(value = "拉动方式") private String pullWay; @Column(name = "TAIL_QTY_MODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") @ApiParam(value = "尾数计算方式", example = "1") private Integer tailQtyMode; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double cycleRquestQty = 0d; @Column(name = "CURING_TIME") @ApiParam(value = "固化时间", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; public int getIqcVal() { 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 5af3d21..d96f8c2 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,26 +32,26 @@ public class WmsPartCheckType extends BaseBean { @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workCenterCode; @Column(name = "PART_NO") @ApiParam("物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partNo; @Column(name = "PART_NAME") @ApiParam("物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partName; @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") private Integer checkType; @Column(name = "SAMPLE_SIZE") @ApiParam("样本数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer sampleSize; } 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 e01c45c..75d3389 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -39,121 +39,121 @@ public class WmsPartExtend extends BaseBean { @Column(name = "IS_SETTLE") @ApiParam(value = "是否内部交易") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isSettle; @Column(name = "SETTLE_FACTORY_CODE") @ApiParam(value = "结算工厂") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String settleFactoryCode; @Column(name = "SETTLE_REC_ERP_WH") @ApiParam(value = "结算物料收货库存") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String settleRecErpWh; @Column(name = "VALUATION_CLASS") @ApiParam(value = "评估类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String valuationClass; @Column(name = "VALUATION_CLASS_NAME") @ApiParam(value = "评估类描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String valuationClassName; @Column(name = "MC_CODE") @ApiParam(value = "MRP控制者") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String mcCode; @Column(name = "MC_NAME") @ApiParam(value = "MRP控制者名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String mcName; @Column(name = "IS_STEEL") @ApiParam(value = "是否为钢卷料") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_STEEL_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_STEEL_TYPE") private Integer isSteel; @Column(name = "IS_PACKAGE_MATERIAL") @ApiParam(value = "是否为包材") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isPackageMaterial; @Column(name = "RECEIVING_TYPE") @ApiParam(value = "收货类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String receivingType; @Column(name = "LOT_CONTROL") @ApiParam(value = "批次控制") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotControl; @Column(name = "RANGE_LOT") @ApiParam(value = "批次容差") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer rangeLot; @Column(name = "QUALITY_RATE") @ApiParam(value = "质检率") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qualityRate; @Column(name = "ROUTING") @ApiParam(value = "工艺") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routing; @Column(name = "PO_PART_MULTIPLE") @ApiParam(value = "乘倍包装") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String poPartMultiple; @Column(name = "RANGE_QTY_RATE") @ApiParam(value = "数量容差") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer rangeQtyRate; @Column(name = "RANGE_INVENTORY") @ApiParam(value = "盘点容差") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer rangeInventory; @Column(name = "PROD_LINE") @ApiParam(value = "产品类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String prodLine; @Column(name = "SUPPLY_TYPE") @ApiParam(value = "供货类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_SUPPLY_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_SUPPLY_TYPE") private Integer supplyType; @Column(name = "RECEIVING_MODE") @ApiParam(value = "收货方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_METHOD") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_RECEIVING_METHOD") private Integer receivingMethod; @Column(name = "PRE_RECEIVING_DAY") @ApiParam(value = "预收货天数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer preReceivingDay; @Column(name = "IS_WAY_CALCULATION") @ApiParam(value = "是否计算在途库存") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isWayCalculation; @Column(name = "IS_AUTO_PURCHASE") @ApiParam(value = "是否自动采购") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isAutoPurchase; @Column(name = "AUTO_PURCHASE_QTY") @ApiParam(value = "自动采购数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer autoPurchaseQty; } 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 9641130..5265509 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 @@ -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; @@ -31,9 +33,11 @@ public class WmsPartGroup extends BaseBean{ private static final long serialVersionUID = 9214639813072864436L; @Column(name="PART_GROUP_NO") @ApiParam("物料组编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partGroupNo; @Column(name="PART_GROUP_NAME") @ApiParam("物料组名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partGroupName; } \ No newline at end of file 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 8498c36..78f8058 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,46 +32,46 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workCenterCode; @Column(name = "PART_NO") @ApiParam("物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partNo; @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") private Integer checkType; @Column(name = "CHECK_ITEM_CODE") @ApiParam("子检测项代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String checkItemCode; @Column(name = "CHECK_ITEM_NAME") @ApiParam("子检测项名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String checkItemName; @Column(name = "VALUE_TYPE") @ApiParam("子检测箱值类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") private Integer valueType; @Column(name = "STANDARD") @ApiParam("标准值") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double standard; @Column(name = "MAX") @ApiParam("最大值") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "MIN") @ApiParam("最小值") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; } 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 e7dc3ca..2896d6e 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 @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.wms.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; @@ -16,11 +14,11 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :容器类型 + * @Description :物料包装关系 * @Reference : - * @Author : 容器类型 + * @Author : * @CreateDate : 2019-11-07 16:06 - * @Modify: + * @Modify: 2020-04-27 修改头部描述-dragon **/ @Data @Entity 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 4539336..a90107b 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 @@ -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; @@ -31,10 +33,12 @@ public class WmsProdCfgType extends BaseBean { private static final long serialVersionUID = -131043081244530896L; @Column(name="PROD_CFG_TYPE_CODE") @ApiParam("项目代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String prodCfgTypeCode; @Column(name="PROD_CFG_TYPE_NAME") @ApiParam("项目名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String prodCfgTypeName; } 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 90b3a58..52d22b3 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -31,21 +30,21 @@ import javax.persistence.Table; public class WmsPullRule extends BaseBean { @Column(name = "PULL_WAY") @ApiParam(value = "拉动类型", example = "10") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS") private Integer pullWay; @Column(name = "CONTAIN_UNFINISH_ORDER") @ApiParam(value = "考虑未完成的移库单", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer containUnfinishOrder; @Column(name = "CONTAIN_EXIST_PERIOD") @ApiParam(value = "考虑现有库存", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer containExistStock; @Column(name = "TAIL_QTY_MODE") @ApiParam(value = "尾数计算方式", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") private Integer tailQtyMode; } 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 aa9559c..00fa875 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 @@ -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; @@ -32,42 +34,56 @@ public class WmsPullTaskMaster extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String woekorderNo; @Column(name="PDLINE_NO") @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 = "workCenterCode") private String pdlineNo; @Column(name="PLAN_PRODUCT_TIME") @ApiParam("生产日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String planProductTime; @Column(name="SHIFT_NO") @ApiParam("班次代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsShift", + searchColumnName = "shiftNo,shiftName", listColumnName = "shiftNo,shiftName", explicitColumnName = "shiftNo") private String shitNo; @Column(name="START_PRODUCT_TIME") @ApiParam("开始生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startProductTime; @Column(name="END_PRODUCT_TIME") @ApiParam("结束生产时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endProductTime; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_MASTER_STATUS") private Integer orderStatus = 0; @Column(name="IS_SUSPEND") @ApiParam(value = "是否暂停", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isSuspend = 2; @Column(name="PULL_TASK_TYPE") @ApiParam(value = "拉动任务类型", example = "10") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_TASK_TYPE") private Integer pullTaskType; @Column(name="SEQ") @ApiParam(value = "排序号", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer seq; public Integer getOrderStatus() { 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 33ed3df..bfe28bc 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 @@ -1,7 +1,9 @@ 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; @@ -34,6 +36,7 @@ public class WmsQCMaster extends BaseBean { private static final long serialVersionUID = 2701710669030092148L; @Column(name = "ORDER_NO") @ApiParam("单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String orderNo; /** @@ -43,6 +46,7 @@ public class WmsQCMaster extends BaseBean { @Column(name = "ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_TYPE") public Integer orderType; /** @@ -51,48 +55,67 @@ public class WmsQCMaster extends BaseBean { @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS") public Integer orderStatus; @Column(name = "REMARK") @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String remark; @Column(name = "CUST_NO") @ApiParam("客户编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") public String custNo; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") public String vendorNo; @Column(name = "VERSION") @ApiParam(value = "版本", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Integer version; @Column(name = "REF_TYPE") @ApiParam("关联单号类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE") public String refType; @Column(name = "REF_SRC") @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; - @Transient + @Column(name = "CUST_NAME") @ApiParam(value = "客户简称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo") private String custName; - @Transient - @ApiParam(value = "供应商简称") + @Column(name = "VENDOR_DESC") + @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; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "IS_GENERAL_TASK") public Integer isTask; @Column(name = "IS_PART") @ApiParam(value = "是否散件", example = "2") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") public Integer isPart; @Transient 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 1ac54c6..67c0edd 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 @@ -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; @@ -33,26 +35,32 @@ public class WmsRouting extends BaseBean { private static final long serialVersionUID = 7759454799191378612L; @Column(name = "ROUTING_CODE") @ApiParam(value = "线路代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routingCode; @Column(name = "ROUTING_NAME") @ApiParam(value = "线路名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String routingName; @Column(name = "ROUTING_DESC") @ApiParam(value = "线路描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String routingDesc; @Column(name = "FOR_PROUCT_CLASS") @ApiParam(value = "适用产品分类") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forProductClass; @Column(name = "FOR_WAREHOUSE") @ApiParam(value = "适用仓库", example ="1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forWareHouse; @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer forProduct; @Transient 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 b894c55..40f637d 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 @@ -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; @@ -32,17 +34,21 @@ public class WmsShift extends BaseBean{ @Column(name="SHIFT_NO") @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shiftNo; @Column(name="SHIFT_NAME") @ApiParam("班次名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shiftName; @Column(name="START_TIME") @ApiParam("开始时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String startTime; @Column(name="END_TIME") @ApiParam("结束时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endTime; } \ No newline at end of file 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 a64dc8f..2ce24ae 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 @@ -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; @@ -32,45 +34,60 @@ public class WmsShippingFlag extends BaseBean { @Column(name = "CUST_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.BasCustomer", + searchColumnName = "custNo,custName", listColumnName = "custNo,custName", explicitColumnName = "custNo") private String custNo; @Column(name = "FLAG_NO") @ApiParam(value = "客户发往地编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String flagNo; @Column(name = "FLAG_NAME") @ApiParam(value = "客户发往地名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String flagName; @Column(name = "SHIPP_QTY") @ApiParam(value = "发运数量控制") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer shippQty; @Column(name = "FLAG_DESC") @ApiParam(value = "全称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagDesc; @Column(name = "FLAG_ADDR") @ApiParam(value = "客户发往地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagAddr; @Column(name = "FLAG_OWNER") @ApiParam(value = "联系人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagOwner; @Column(name = "FLAG_EMAIL") @ApiParam(value = "邮箱") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagEmail; @Column(name = "FLAG_TEL") @ApiParam(value = "联系人电话") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagTel; @Column(name = "FLAG_FAX") @ApiParam(value = "传真") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String flagFax; @Column(name="TEMPLATE_NO") @ApiParam("模板编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/wms/label/sys-label-template/cloud-query", + searchColumnName = "templateCode,templateName",listColumnName = "templateCode,templateName", explicitColumnName = "templateCode") private String templateNo; } 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 127238a..63e33e3 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 @@ -3,6 +3,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; @@ -34,7 +35,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "SN") @ApiParam(value = "条码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String sn; @Column(name = "LINE_CODE") @@ -77,12 +78,12 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam(value = "操作类型") @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "SN_OPERATE_TYPE") private Integer operateType; @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSN; } 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 314f299..70f8c54 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 @@ -1,7 +1,9 @@ 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; @@ -12,11 +14,7 @@ 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.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.Date; import java.util.List; @@ -52,75 +50,107 @@ public class WmsStockSn extends BaseBean { private static final long serialVersionUID = 4869307400585363697L; @Column(name = "WH_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.WareHouse", + searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_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.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name = "LOT_NO", nullable = false) @ApiParam("收货批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String lotNo = ""; @Column(name = "DATE_CODE", nullable = false) @ApiParam(value = "供应商批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String dateCode = ""; @Column(name = "FIX_LOT_NO", nullable = false) @ApiParam(value = "特殊批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String fixLotNo = ""; @Column(name = "QUALITY_DATE") @ApiParam("保质期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String qualityDate; @Column(name = "LEFT_CODE", nullable = false) @ApiParam(value = "生产批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String leftCode = ""; @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") public String vendorNo; @Column(name = "CUST_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.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String custNo; @Column(name = "SHIPPING_FLAG") @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shippingFlag; @Column(name = "SN") @ApiParam(value = "条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sn; @Column(name = "SN_2D") @ApiParam(value = "二维码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sn2d; @Column(name = "PACKAGE_NO") @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String packageNo; @Column(name = "UNIT") @ApiParam(value = "单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty = 0d; /** @@ -128,49 +158,58 @@ public class WmsStockSn extends BaseBean { */ @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_QC_STATUS") private Integer qcStatus; /** * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "STOCK_SN_STATUS") private Integer snStatus; /** * 1:已打印；2：未打印；3：退料生成条码 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PRINT_STATUS") private Integer printed; @Column(name = "PDATE") @ApiParam(value = "打印时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Date pdate; /** * 1=ASN,10=PO,20=SO */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSrc; @Column(name = "CUST_SN") @ApiParam(value = "客户条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String custSn; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterCode; @Column(name = "SN_TYPE") @ApiParam(value = "条码类型", example = "10") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE") private Integer snType = 10; @ApiParam(value = "仓库名称") @@ -395,8 +434,8 @@ public class WmsStockSn extends BaseBean { } - public WmsStockSn(Integer snStatus,String whNo,String locateNo,String partNo,String partNameRdd,String lotNo,Double qty){ - this.snStatus=snStatus; + public WmsStockSn(Integer snStatus, String whNo, String locateNo, String partNo, String partNameRdd, String lotNo, Double qty) { + this.snStatus = snStatus; this.whNo = whNo; this.locateNo = locateNo; this.partNo = partNo; @@ -405,7 +444,7 @@ public class WmsStockSn extends BaseBean { this.qty = qty; } - public WmsStockSn(Long id,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + public WmsStockSn(Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo, String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, String qualityDate, String custNo, String lotCheckRule, String sn2d, @@ -439,17 +478,17 @@ public class WmsStockSn extends BaseBean { this.modifyUser = modifyUser; } - public WmsStockSn (String partNo, String packageNo,String locateNo, String createDatetime, String modifyDatetime) { + public WmsStockSn(String partNo, String packageNo, String locateNo, String createDatetime, String modifyDatetime) { this.partNo = partNo; - this.packageNo =packageNo; + this.packageNo = packageNo; this.locateNo = locateNo; - this.createDatetime=createDatetime; + this.createDatetime = createDatetime; this.modifyDatetime = modifyDatetime; } - public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, - String areaNo,String partSpec,Integer qcStatus, Double qty, Long boxQtys, - String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo, String partSpec, Integer qcStatus, Double qty, Long boxQtys, + String locateNo, String zoneNo, String whNo, String lotNo, String refSrc, String dateCode, String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) { this.id = id; @@ -477,9 +516,9 @@ public class WmsStockSn extends BaseBean { this.modifyUser = modifyUser; } - public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, - String areaNo,Integer qcStatus, Double qty, - String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + public WmsStockSn(Long id, String organizeCode, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo, Integer qcStatus, Double qty, + String locateNo, String zoneNo, String whNo, String lotNo, String refSrc, String dateCode, String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) { this.id = id; 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 9120e8d..1bab8d2 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,21 +35,21 @@ public class WmsSubPart extends BaseBean { @Column(name = "PART_NO") @ApiParam(value = "物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "SUB_PART_NO") @ApiParam(value = "替代物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String subPartNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "SUB_PART_NAME") @ApiParam(value = "替代物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String subPartName; } 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 3531e8f..6d7bec2 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 @@ -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; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.UniqueConstraint; /** * @Description : 工位表 @@ -32,13 +33,18 @@ public class WmsTerminal extends BaseBean{ private static final long serialVersionUID = 9214639813072592713L; @Column(name="TERMINAL_NO") @ApiParam("工位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String terminalNo; @Column(name="TERMINAL_NAME") @ApiParam("工位名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String terminalName; @Column(name="PDLINE_NO") @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 = "workCenterCode") private String pdlineNo; } \ No newline at end of file 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 0ecea20..9e6d386 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 @@ -1,7 +1,9 @@ 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; @@ -31,33 +33,41 @@ public class WmsTmsDriver extends BaseBean { @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String driverNo; @Column(name="DRIVER_NAME") @ApiParam(value ="驾驶员姓名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String driverName; @Column(name="SEX") @ApiParam(value ="驾驶员性别") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer sex; @Column(name="AGE") @ApiParam(value ="驾驶员年龄") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String age; @Column(name="ID_NO") @ApiParam(value ="驾驶员身份证号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String idNo; @Column(name="ADRESS") @ApiParam(value ="驾驶员籍贯") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String adress; @Column(name="PHONE") @ApiParam(value ="车牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String phone; @Column(name="LOGIN_NO") @ApiParam(value =" 登录账号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String loginNo; } 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 b163bbb..14fbf1f 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 @@ -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; @@ -36,30 +38,47 @@ public class WmsTransQuan extends BaseBean { private static final long serialVersionUID = -7379945456037422449L; @Column(name = "TRANS_NO") @ApiParam(value = "事务编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transNo; @Column(name = "WH_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.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "LOCATE_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.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String locateNo; @Column(name = "PART_NO") @ApiParam(value = "物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name = "UNIT") @ApiParam(value = "单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unit; @Column(name = "TRANS_STATUS") @@ -76,75 +95,95 @@ public class WmsTransQuan extends BaseBean { @Column(name = "REF_SRC") @ApiParam(value = "关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String refSrc; @Column(name = "TRANS_CODE") @ApiParam(value = "交易代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transCode; @Column(name = "MOVE_NO") @ApiParam(value = "库存移动单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String moveNo; @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 vendorNo; @Column(name = "CUST_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.BasCustomer", + searchColumnName = "custNo,custDesc", listColumnName = "custNo,custDesc", explicitColumnName = "custNo") private String custNo; @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String errorMessage; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) public Double qty; @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double failQty; @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double holdQty; @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double qcQty; @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double rinQty; @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double freezeQty; @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double consignQty; @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double lockQty; @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double scrapQty; @Column(name="TRANS_TYPE_NAME") @ApiParam(value ="交易名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String transTypeName; /*@Transient 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 8d9a807..744f71c 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 @@ -3,6 +3,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; @@ -10,7 +11,11 @@ import lombok.Data; 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.Table; +import javax.persistence.Transient; import java.util.List; @@ -39,46 +44,46 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_TYPE") @ApiParam("业务类型") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE") public Integer busiType; @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE") public Integer busiSceneType; @Column(name = "SRC_AREA_NO") @ApiParam("发货库存地") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String srcAreaNo; @Column(name = "DEST_AREA_NO") @ApiParam("目标库存地") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String destAreaNo; @Column(name = "OUT_VENDOR_NO") @ApiParam("委外供应商编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String outVendorNo; @Column(name = "PART_NO") @ApiParam("物料编码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String partNo; @Column(name = "CUST_NO") @ApiParam("客户代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String custNo; @Column(name = "IS_TRANSPORT") @ApiParam("是否安排运输") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") public Integer isTransport; @Column(name = "REMARK",length = 255) 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 290f7c0..84ce516 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 @@ -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; @@ -31,14 +33,17 @@ public class WmsUnit extends BaseBean { private static final long serialVersionUID = 7332606009041273554L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitCode; @Column(name = "UNIT_NAME") @ApiParam(value = "单位名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitName; @Column(name = "UNIT_PRECISION") @ApiParam(value = "单位精度") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer unitPrecision; public Integer getUnitPrecisionValue(){ 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 03e877d..5fbc76e 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 @@ -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; @@ -31,14 +33,17 @@ public class WmsUnitConvert extends BaseBean { private static final long serialVersionUID = -466720560879335877L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String unitCode; @Column(name = "DEST_UNIT_CODE") @ApiParam(value = "目标单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String destUnitCode; @Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double unitCoefficient; public Double getUnitCoefficientVal() { 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 042c111..bcd0499 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 @@ -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; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 供应商零件关系 @@ -22,20 +23,26 @@ import javax.persistence.Transient; **/ @Data @Entity -@Table(name="WMS_VENDOR_PART") +@Table(name = "WMS_VENDOR_PART") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="供应商零件关系",description = "供应商零件关系") +@Api(value = "供应商零件关系", description = "供应商零件关系") public class WmsVendorPart extends BaseBean { private static final long serialVersionUID = 7339520734918140529L; @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 vendorNo; @Column(name = "PART_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.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name = "VENDOR_PART_NO") @@ -44,14 +51,20 @@ public class WmsVendorPart extends BaseBean { @Column(name = "MAX_AMOUNT") @ApiParam(value = "供应商月提供最大数量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double maxAmount; - @Transient + @Column(name = "PART_NO_NAME") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partName; - - @Transient + @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") + @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 = "vendorName") private String vendorName; } 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 6da587b..241599c 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 @@ -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; @@ -31,30 +33,43 @@ public class WmsWorkCenter extends BaseBean { private static final long serialVersionUID = 415180808859365167L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterCode; @Column(name = "WORK_CENTER_NAME") @ApiParam(value = "工作中心名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String workCenterName; @Column(name = "ERP_WORK_CENTER") @ApiParam(value = "ERP_工作中心") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String erpWorkCenter; @Column(name = "WORK_VER") @ApiParam(value = "生产版本") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String workVer; @Column(name = "SRC_ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String srcZoneNo; @Column(name = "DESC_ZONE_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.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String descZoneNo; @Column(name = "DESC_LOCATION_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.WmsLocate", + searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; } 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 9175316..1a792c6 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 @@ -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; @@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 工作中心线边库区关系 @@ -28,21 +29,33 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Api(value="工作中心线边库区关系",description = "工作中心线边库区关系") public class WmsWorkCenterZone extends BaseBean { - private static final long serialVersionUID = 950689993212839817L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") + @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 = "workCenterCode") private String workCenterCode; @Column(name = "ZONE_NO") @ApiParam(value = "线边库区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; - @Transient + @Column(name = "WORK_CENTER_NAME") @ApiParam("工作中心名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, 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 workCenterName; - @Transient + @Column(name = "ZONE_NAME") @ApiParam("线边库区名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneName") private String zoneName; } 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 11d9020..78913f6 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 @@ -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; @@ -32,42 +34,57 @@ public class WmsZonePart extends BaseBean{ private static final long serialVersionUID = 9214639813072592546L; @Column(name="ZONE_NO") @ApiParam("存储区编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name="PART_NO") @ApiParam("物料编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; @Column(name="PULL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "拉动数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double pullQty; @Column(name="MAX", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "最大值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name="MIN", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "最小值", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "IS_GENERATE_PICKLIST") @ApiParam(value = "是否生成领料单", example = "2") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isGeneratePickList; @Column(name="MOQ", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "起订量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Double moq; @Column(name="SAFETY_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "安全量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double safetyQty; } \ No newline at end of file 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 f916604..5d1e4b0 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 @@ -2,7 +2,7 @@ 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.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,82 +35,82 @@ public class WmsZones extends BaseBean { private static final long serialVersionUID = 7759454799191378612L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String whNo; @Column(name = "AREA_NO") @ApiParam(value = "库存地代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String zoneNo; @Column(name = "ZONE_NAME") @ApiParam(value = "存储区名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String zoneName; @Column(name = "PARENT_ZONE_NO") @ApiParam(value = "父级存储区", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String parentZoneNo; @Column(name = "IS_SON_NODE") @ApiParam(value = "是否子节点") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "TRUE_OR_FALSE") private Integer isSonNode; @Column(name = "IS_PM") @ApiParam(value = "零件级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isPm; @Column(name = "IS_LM") @ApiParam(value = "批次级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isLm; @Column(name = "IS_SN") @ApiParam(value = "条码级管控", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isSn; @Column(name = "IS_MIX") @ApiParam(value = "允许混淆", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isMix; @Column(name = "IS_SC") @ApiParam(value = "库容检查", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isSc; @Column(name = "STRATEGY") @ApiParam(value = "堆放策略") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String strategy; @Column(name = "IS_NEGATIVE") @ApiParam(value = "允许负库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer isNegative; @Column(name = "CHECK_FIFO") @ApiParam(value = "校验先进先出", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer checkFifo; @Column(name = "ZONE_LENGTH") @ApiParam(value = "长") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer zoneLength; @Column(name = "ZONE_WIDTH") @ApiParam(value = "宽") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer zoneWidth; @Column(name = "POSITION") @@ -119,17 +119,17 @@ public class WmsZones extends BaseBean { @Column(name = "ZONE_PULL_WAY") @ApiParam(value = "补货方式", example = "10") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "ZONE_PULL_WAY") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "ZONE_PULL_WAY") private Integer zonePullWay; @Column(name = "PULL_CYCLE") @ApiParam(value = "固定拉动周期", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer pullCycle; @Column(name = "LAST_PULL_TIME") @ApiParam(value = "上次拉动时间") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastPullTime; @Transient 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 01b511f..d7c87ee 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 @@ -7,10 +7,8 @@ import lombok.Data; 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.*; /** * @Description : WMS字段信息表 @@ -21,14 +19,18 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_FIELDINFO", indexes = { +@Table(name = "WMS_FIELDINFO", + indexes = { @Index(columnList = "FIELD_NAME"), - @Index(columnList = "ENTITY_NAME") -}) + @Index(columnList = "ENTITY_NAME")}, + uniqueConstraints = { + @UniqueConstraint(columnNames = { + "FIELD_NAME", "ENTITY_NAME"})} +) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="WMS字段信息表",description = "WMS字段信息表") +@Api(value = "WMS字段信息表", description = "WMS字段信息表") public class WmsFieldInfo extends BaseBean { private static final long serialVersionUID = 3903166651913139064L; @@ -109,7 +111,15 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "回显列名") private String explicitColumnName; - @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @Column(name = "IS_MULTIPLE") + @ApiParam(value = "是否多选") + private Integer isMultiple; + + @Column(name = "DATA_SRC") + @ApiParam(value = "数据来源") + private String dataSrc; + + @Column(name = "GET_VAL_WAY") @ApiParam(value = "下拉框规则") - private Integer selectRule; + private Integer getValWay; } 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 63c7ee5..5ebf953 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 @@ -89,9 +89,9 @@ public class WmsListElement extends BaseBean { @ApiParam(value = "字段类型") private Integer fieldType; - @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @Column(name = "DYNAMIC_FIELD_GET_WAY") @ApiParam(value = "下拉框规则") - private Integer selectRule; + private Integer getValWay; @Column(name = "ENTITY_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 9b21eb1..e18d545 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 @@ -2921,7 +2921,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); - DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result); getStringBuilderPack(wmsFieldInfo, result); return result; } From 5fb7eecee078f3602c237e39f82393e1b29e2ddf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 8 May 2020 20:36:34 +0800 Subject: [PATCH 066/134] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1752=20oee?= =?UTF-8?q?=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/base/enumutil/MesEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 4 ++++ 2 files changed, 6 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 ddb7f2e..156b353 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 @@ -5077,7 +5077,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BOARD_TYPE { BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), - BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"); + BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), + BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"); private String code; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index d1dd2da..a115e99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail; import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus; import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; +import cn.estsh.i3plus.pojo.mes.bean.MesOee; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -48,4 +49,7 @@ public class BoardModel { @ApiParam("看板设备明细") private List boardEquDetailList; + + @ApiParam("oee") + private List oeeList; } From bbbdfae633f9c8b9446221c9b423655aa867431b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 9 May 2020 11:15:46 +0800 Subject: [PATCH 067/134] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=88=86=E7=B1=BB=E5=AE=9E=E4=BD=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java index fe7f66d..63e108f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -20,6 +20,9 @@ public class BasBeanInfoModel implements Serializable { private static final long serialVersionUID = -6376845639646448495L; + @ApiParam(value = "系统名称") + public String systemName; + @ApiParam(value = "实体名称") public String entityName; From 7ef769268d3200c06c38a8961c073c09b0df64f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 11:38:35 +0800 Subject: [PATCH 068/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0MES=5F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=92=8C=E6=A3=80=E9=AA=8C=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=AE=9E=E4=BD=93=E4=B8=8E=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/MesEnumUtil.java | 95 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 85 +++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 77 ++++++++++++++++++ 3 files changed, 257 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index e126301..4437fc2 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 @@ -2506,6 +2506,7 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { + IN_MATERIAL_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), END_CHECK(30, "尾检"); @@ -5174,4 +5175,98 @@ public class MesEnumUtil { } } + /** + * MES_检验单 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_STATUS { + + CREATE(10, "创建"), + IN_EXEC(20, "执行中"), + COMPLETE(30, "完成"); + + private int value; + private String description; + + MES_QC_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 static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * MES_检验单 检测整体结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_CHECK_RESULT { + + PASS(10, "通过"), + NO_PASS(20, "不通过"), + COMPROMISE_PASS(30, "让步通过"); + + private int value; + private String description; + + MES_QC_CHECK_RESULT(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 Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } 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 new file mode 100644 index 0000000..2f29e00 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -0,0 +1,85 @@ +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; +import java.math.BigDecimal; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER") +@Api("MES_检验单") +public class MesQcOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182786427690154L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "QTY") + @ApiParam("数量") + private BigDecimal qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuId; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CHECK_RESULT") + @ApiParam("检测整体结果") + private Integer checkResult; +} 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 new file mode 100644 index 0000000..9471a66 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -0,0 +1,77 @@ +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; +import java.math.BigDecimal; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER") +@Api("MES_检验单") +public class MesQcOrderDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182786786500154L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String partName; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String supplierCode; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private String fixLotNo; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CHECK_RESULT") + @ApiParam("检测整体结果") + private Integer checkResult; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; +} From 6d7d8de7b3e0a37cf3ddd0e9b4646cd28d22e8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 11:50:00 +0800 Subject: [PATCH 069/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0MES=5F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=92=8CMES=5F=E6=A3=80=E9=AA=8C=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9A=84=E5=AE=9E=E4=BD=93=E5=92=8C=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= 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 | 1 - 1 file changed, 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 9471a66..2b88d9a 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 @@ -13,7 +13,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.io.Serializable; -import java.math.BigDecimal; /** * @Description :mes系统业务动作 From a1579a2484d2aa438e1b508e56815d0345094214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 13:39:14 +0800 Subject: [PATCH 070/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=8A=A5=E8=A1=A8model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- .../i3plus/pojo/mes/model/QcDetailReportModel.java | 57 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 36 ++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java 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 2b88d9a..33fb5c9 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 @@ -44,7 +44,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "CHECK_ITEM") @ApiParam("检测项") - private String partName; + private String checkItem; @Column(name = "CHECK_STANDARD") @ApiParam("检测标准") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java new file mode 100644 index 0000000..d29da2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QcDetailReportModel implements Serializable { + @ApiParam(value = "顾客名称") + private String customerName; + + @ApiParam(value = "供应商名称") + private String supplierName; + + @ApiParam(value = "供应商代码") + private String supplierCode; + + @ApiParam(value = "送货时间") + private String deliveryDate; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料描述") + private String partName; + + @ApiParam(value = "生产日期") + private String productDate; + + @ApiParam(value = "送货批次") + private String deliveryLotNo; + + @ApiParam(value = "本批次生产总数") + private String lotNoProdQry; + + @ApiParam(value = "供货数量") + private String supplyQty; + + @ApiParam(value = "检测类型") + private Integer checkType; + + @ApiParam(value = "检验项") + private String checkItem; + + @ApiParam(value = "检验要求") + private String checkStandard; + + @ApiParam(value = "检测值") + private String checkValue; + + @ApiParam(value = "检测结果") + private Integer checkResult; + + @ApiParam(value = "备注") + private String memo; +} 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 e3808fb..4591186 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 @@ -928,6 +928,42 @@ public class MesHqlPack { } /** + * MES 检验单查询条件封装 + * + * @param qcOrder + * @return + */ + public static DdlPackBean getMesQcOrder(MesQcOrder qcOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrder, organizeCode); + if (!StringUtils.isEmpty(qcOrder.getOrderNo())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(qcOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getPartName())) { + DdlPreparedPack.getStringLikerPack(qcOrder.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getSupplierCode())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getSupplierCode(), "supplierCode", packBean); + } + // 时间段查询 + if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrder.getCreateDateTimeStart(), + qcOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(qcOrder.getModifyDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getModifyDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrder.getModifyDateTimeStart(), + qcOrder.getModifyDateTimeEnd(), + "modifyDatetime", packBean, true); + } + return packBean; + } + + /** * MES 物料信息查询条件封装 * * @param part From da8b4db89020f68848126905ca10e6ec81e24f35 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 9 May 2020 13:46:00 +0800 Subject: [PATCH 071/134] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpom=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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/pom.xml | 4 ++-- 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-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- 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 | 4 ++-- 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 +- 20 files changed, 25 insertions(+), 25 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 9302dfc..3d6cbc0 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index a933723..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 712a842..3937425 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 a44418c..e12eaee 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 375d0fd..5bfdd66 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 d1ea30d..8b15a31 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 50ab2c2..7637865 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-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a2bb2df..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 265f98d..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 0080b0c..23f68bd 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 24de8cf..28cf55f 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 0fbfb69..26a7311 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 069a4e2..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 590b56c..910d630 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 ac9e7dd..e5b4e5c 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 f153994..0ecf190 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 1bef72c..fbbe86f 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 55e4e84..932bdd9 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 23d1762b5b9555bf5069e3a7d5376a001107d958 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 9 May 2020 14:12:36 +0800 Subject: [PATCH 072/134] =?UTF-8?q?[bug:=208422=20=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0bug]?= 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 | 2 +- 1 file changed, 1 insertion(+), 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 ddc37ba..fb6c793 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 @@ -69,7 +69,7 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "ITEM_QTY") @ApiParam("原材料用量") - private String itemQty; + private Double itemQty; @Column(name = "ITEM_UNIT") @ApiParam("原材料单位") From 1dad60b1290c3efcb9be5609faf6e99e124950d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 9 May 2020 14:20:38 +0800 Subject: [PATCH 073/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9pojo=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E7=9A=84=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=90=E7=B3=BB=E7=BB=9F=E3=80=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6Bug=EF=BC=9A8420?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java index fe7f66d..63e108f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -20,6 +20,9 @@ public class BasBeanInfoModel implements Serializable { private static final long serialVersionUID = -6376845639646448495L; + @ApiParam(value = "系统名称") + public String systemName; + @ApiParam(value = "实体名称") public String entityName; From 23b06a53afbade43dde78cbb1828abc9b8a1df9d Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 9 May 2020 15:10:30 +0800 Subject: [PATCH 074/134] bug:8404 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 366bf4d..c483463 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 @@ -6468,8 +6468,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BH_VALUE_TYPE { - NUMBER(10, "NUMBER", "功能检测"), - TEXT(20, "TEXT", "尺寸检测"); + NUMBER(10, "NUMBER", "数字"), + TEXT(20, "TEXT", "文本"); private int value; private String code; From abbab6bda4501370a224463fc1c2705888eb416f Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Sat, 9 May 2020 17:37:20 +0800 Subject: [PATCH 075/134] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=A8=A1=E5=9D=97=E6=A3=80=E7=B4=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java index d38f6c9..21da796 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java @@ -6,5 +6,5 @@ import lombok.Data; public class FilterRule { private String field; private String op; - private String value; + private Object value; } From 4f5f9777a2003c0c8a76a86a8f1b7e6013a2e7a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 17:56:42 +0800 Subject: [PATCH 076/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E4=B8=8Emodel=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/MesQcOrder.java | 5 ++ .../i3plus/pojo/mes/model/QcDetailReportModel.java | 57 ---------------------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 +++++- 3 files changed, 19 insertions(+), 58 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java 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 2f29e00..dcc8eed 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 @@ -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; import java.io.Serializable; import java.math.BigDecimal; @@ -82,4 +83,8 @@ public class MesQcOrder extends BaseBean implements Serializable { @Column(name = "CHECK_RESULT") @ApiParam("检测整体结果") private Integer checkResult; + + @Transient + @ApiParam("供应商名称") + private String supplierName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java deleted file mode 100644 index d29da2c..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class QcDetailReportModel implements Serializable { - @ApiParam(value = "顾客名称") - private String customerName; - - @ApiParam(value = "供应商名称") - private String supplierName; - - @ApiParam(value = "供应商代码") - private String supplierCode; - - @ApiParam(value = "送货时间") - private String deliveryDate; - - @ApiParam(value = "物料号") - private String partNo; - - @ApiParam(value = "物料描述") - private String partName; - - @ApiParam(value = "生产日期") - private String productDate; - - @ApiParam(value = "送货批次") - private String deliveryLotNo; - - @ApiParam(value = "本批次生产总数") - private String lotNoProdQry; - - @ApiParam(value = "供货数量") - private String supplyQty; - - @ApiParam(value = "检测类型") - private Integer checkType; - - @ApiParam(value = "检验项") - private String checkItem; - - @ApiParam(value = "检验要求") - private String checkStandard; - - @ApiParam(value = "检测值") - private String checkValue; - - @ApiParam(value = "检测结果") - private Integer checkResult; - - @ApiParam(value = "备注") - private String memo; -} 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 4591186..de193d7 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 @@ -5,7 +5,6 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; @@ -964,6 +963,20 @@ public class MesHqlPack { } /** + * MES 检验单查询条件封装 + * + * @param qcOrderDetail + * @return + */ + public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode); + if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { + DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); + } + return packBean; + } + + /** * MES 物料信息查询条件封装 * * @param part From f302b4d5f1289d89ba9097ec8f38d188ec1515ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 18:14:07 +0800 Subject: [PATCH 077/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9MES=5F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=AE=9E=E4=BD=93=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/MesQcOrderDetail.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 33fb5c9..7af9162 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 @@ -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; import java.io.Serializable; /** @@ -52,7 +53,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "CHECK_GUIDE") @ApiParam("检测指导") - private String supplierCode; + private String checkGuide; @Column(name = "CHECK_FREQUENCY") @ApiParam("频率") @@ -60,7 +61,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private String fixLotNo; + private String isConCession; @Column(name = "STATUS") @ApiParam("状态") @@ -73,4 +74,12 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "CHECK_VALUE") @ApiParam("检测值") private String checkValue; + + @Transient + @ApiParam("本批次生产总数") + private Integer currentLotNoSum; + + @Transient + @ApiParam("收货批次") + private String srcLotNo; } From 7ac98ffbc698c392044eb8536b10aba29fb8d00a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 9 May 2020 19:34:22 +0800 Subject: [PATCH 078/134] =?UTF-8?q?=E3=80=901797=20=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-=E5=AE=9A=E5=88=B6=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1-VDA=E6=A0=87=E7=AD=BE=E9=98=B2=E9=94=99=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=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/WmsSnOperateRecord.java | 4 ++++ 1 file changed, 4 insertions(+) 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 127238a..d80d80b 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 @@ -85,4 +85,8 @@ public class WmsSnOperateRecord extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String refSN; + @Column(name = "REMARK") + @ApiParam(value = "备注") + private String remark; + } From 70aeae21d3f256a0f2e94a906777131326d069b5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 11 May 2020 09:33:50 +0800 Subject: [PATCH 079/134] =?UTF-8?q?8426=20=E4=B8=AD=E8=88=AA-=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=87=87=E8=B4=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=9B=B4=E6=94=B9=E6=9F=A5=E8=AF=A2-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 118 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 14 ++- .../i3plus/pojo/wms/bean/WmsStockInitialize.java | 43 +++++++- 3 files changed, 169 insertions(+), 6 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 b9bdfe9..4b04dd4 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 @@ -2175,4 +2175,122 @@ public class CommonEnumUtil { return tmp; } } + + + /** + * 业务表：库存条码质检状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_SN_QC_STATUS { + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), + ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); + + private int value; + private String code; + private String description; + + STOCK_SN_QC_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 Integer valueOfDescription(String desc) { + Integer tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static CommonEnumUtil.STOCK_SN_QC_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) + public enum STOCK_SN_STATUS { + CREATE(10, "创建"), + QUALITY_CONTROL(20, "质检中"), + PRE_INSTOCK(30, "待入库"), + INSTOCKED(40, "入库"), + PICKED(50, "配料"), + OUT_STOCK(60, "出库"), + SCRAP(70, "报废"), + COMMING(80, "在途"); + + private int value; + private String description; + + STOCK_SN_STATUS(int value, String description) { + this.value = value; + 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 Integer valueOfDescription(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } 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 58f5123..bf1994b 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 @@ -12,7 +12,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 :物料实体 @@ -265,6 +269,14 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; + + @Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否回收", example = "2") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) + public Integer isRecycle; + + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); } 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 32fddf1..515de40 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; 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; @@ -33,7 +34,7 @@ public class WmsStockInitialize extends BaseBean { @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String whNo; @Column(name = "ZONE_NO") @@ -53,23 +54,23 @@ public class WmsStockInitialize extends BaseBean { @Column(name = "PART_NAME_RDD") @ApiParam(value = "物料名称") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String partNameRdd; @Column(name = "UNIT") @ApiParam(value = "单位") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String unit; @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "可用数量", example = "0") @ColumnDefault("0") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private Double qty = 0d; @Column(name = "SNP", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "标准包装", example = "1") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private Double snp; @Column(name = "STATUS") @@ -80,4 +81,36 @@ public class WmsStockInitialize extends BaseBean { @AnnoOutputColumn private String currentOrganizeCode; + @Column(name = "SN") + @ApiParam(value = "工装条码") + @AnnoOutputColumn(required = false) + private String sn; + + @Column(name = "QC_STATUS") + @ApiParam(value = "质检状态", example = "0") + @ColumnDefault("10") + @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description", required = false) + private Integer qcStatus; + + /** + * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 + */ + @Column(name = "SN_STATUS") + @ApiParam(value = "条码状态", example = "0") + @ColumnDefault("30") + @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description", required = false) + private Integer snStatus; + + @Column(name = "USE_COUNT", nullable = true) + @ApiParam(value = "领用次数", example = "0") + @ColumnDefault("0") + @AnnoOutputColumn(required = false) + private Integer useCount; + + @Column(name = "SEQ_NO", nullable = true) + @ApiParam(value = "序号", example = "0") + @ColumnDefault("0") + @AnnoOutputColumn(required = false) + private Integer seqNo; + } From a748fbd2f73cbf5b68b8a7f41691fab849ff9929 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 11 May 2020 10:17:29 +0800 Subject: [PATCH 080/134] =?UTF-8?q?8426=20=E4=B8=AD=E8=88=AA-=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=87=87=E8=B4=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=9B=B4=E6=94=B9=E6=9F=A5=E8=AF=A2-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=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/wms/bean/WmsPart.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/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 8d4f97f..bf21ffc 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 @@ -275,7 +275,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否回收", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer isRecycle; From 98091426f2e1b2f23da7abccb8c4cfc20eabd783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 11 May 2020 11:30:35 +0800 Subject: [PATCH 081/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= 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, 2 insertions(+), 2 deletions(-) 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 7af9162..7cf7251 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 @@ -27,8 +27,8 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_ORDER") -@Api("MES_检验单") +@Table(name = "MES_QC_ORDER_DETAIL") +@Api("MES_检验单明细") public class MesQcOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -8961182786786500154L; @Column(name = "ORDER_NO") From 79e90298ef4b161d1d993734eb0468eb16745712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 11 May 2020 13:36:47 +0800 Subject: [PATCH 082/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 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 7cf7251..599196a 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 @@ -61,7 +61,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private String isConCession; + private String isConcession; @Column(name = "STATUS") @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 de193d7..992531d 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 @@ -2568,6 +2568,24 @@ public class MesHqlPack { return packBean; } + /** + * 供应商 + * + * @param basVendor + * @param organizeCode + * @return + */ + public static DdlPackBean getMesBasVendor(BasVendor basVendor, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(basVendor, organizeCode); + if (!StringUtils.isEmpty(basVendor.getVendorNo())) { + DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", packBean); + } + if (!StringUtils.isEmpty(basVendor.getVendorDesc())) { + DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", packBean); + } + return packBean; + } + public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); From 78ff224fe43b6700c28845065083d2edd3504682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 11 May 2020 14:00:26 +0800 Subject: [PATCH 083/134] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ------------------ 1 file changed, 18 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 992531d..de193d7 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 @@ -2568,24 +2568,6 @@ public class MesHqlPack { return packBean; } - /** - * 供应商 - * - * @param basVendor - * @param organizeCode - * @return - */ - public static DdlPackBean getMesBasVendor(BasVendor basVendor, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(basVendor, organizeCode); - if (!StringUtils.isEmpty(basVendor.getVendorNo())) { - DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", packBean); - } - if (!StringUtils.isEmpty(basVendor.getVendorDesc())) { - DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", packBean); - } - return packBean; - } - public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); From 80e572f07d65cd2af879dad47324919d60539d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 11 May 2020 15:28:24 +0800 Subject: [PATCH 084/134] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=92=8C=E4=BC=98=E5=8C=96=E5=AE=9E=E4=BD=93=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java | 46 ++++++++++++++++++++++ .../wms/repository/WmsThymeleafRepository.java | 16 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++++ 3 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java 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 new file mode 100644 index 0000000..d8b72ec --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java @@ -0,0 +1,46 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @Description : WMS回显模板数据 + * @Reference : + * @Author : siliter + * @CreateDate : 2020-05-11 09:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_THYMELEAF") +@Api("WMS回显模板数据") +public class WmsThymeleaf extends BaseBean { + + private static final long serialVersionUID = -5751852067398308165L; + + @Column(name = "TL_CODE") + @ApiParam("模板代码") + private String tlCode; + + @Column(name = "TL_DESC") + @ApiParam("模板描述") + private String tlDesc; + + @Lob + @Column(name = "TL_CONTENT", columnDefinition = "TEXT") + @ApiParam(value = "模板内容") + private String tlContent; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java new file mode 100644 index 0000000..54c1aa5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsThymeleaf; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter + * @CreateDate : 2020-05-11 09:17 + * @Modify: + **/ +@Repository +public interface WmsThymeleafRepository 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 663b86c..55dd8fd 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 @@ -3229,4 +3229,17 @@ public class WmsHqlPack { getStringBuilderPack(checkType, result); return result; } + + /** + * 模板信息分页查询条件 + * @param thymeleaf + * @return + */ + public static DdlPackBean packHqlWmsThymeleaf(WmsThymeleaf thymeleaf) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(thymeleaf.getTlCode(), "tlCode", result); + DdlPreparedPack.getStringLikerPack(thymeleaf.getTlDesc(), "tlDesc", result); + getStringBuilderPack(thymeleaf, result); + return result; + } } From 24806b9e2e2f72560e0ca58417321b84e7ea07b6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 11 May 2020 17:38:40 +0800 Subject: [PATCH 085/134] =?UTF-8?q?[oee=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/bean/MesOee.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 2a3b94c..d40e746 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 @@ -68,13 +68,13 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,3)") @ApiParam("总生产时间") - private String totalRunTime; + private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,3)") @ApiParam("总停机时间") - private String totalStopTime; + private Double totalStopTime; @Column(name = "TOTAL_QTY") @ApiParam("总生产数") @@ -92,21 +92,21 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,3)") @ApiParam("时间开动率") - private String timeRate; + private Double timeRate; - @Column(name = "TAKT_RATE") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,3)") @ApiParam("性能开动率") - private String taktRate; + private Double taktRate; - @Column(name = "QUALIFIED_RATE") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,3)") @ApiParam("良品率") - private String qualifiedRate; + private Double qualifiedRate; - @Column(name = "OEE") + @Column(name = "OEE", columnDefinition = "decimal(18,3)") @ApiParam("OEE") - private String oee; + private Double oee; @Column(name = "BUSI_DATA") @ApiParam("自定义数据") From eb7511c39e666943832e6e199796f2891da22100 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 11 May 2020 18:14:56 +0800 Subject: [PATCH 086/134] bug:8268;8267;8266;8265 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 ++++- 1 file changed, 4 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 aecbbd9..0323dbd 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 @@ -3574,7 +3574,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); + SOURCE(10, "实物条码"), + TARGET(20, "虚拟条码"), + CUST_SN(30, "客户条码"), + FIRST_MIDDLE_LAST(40, "首中末件"); private int value; private String description; From 7d192b36a6010afb776e48bf08b6956a0d30cae3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 11 May 2020 22:39:02 +0800 Subject: [PATCH 087/134] =?UTF-8?q?pom=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 3 ++- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 3 ++- modules/i3plus-pojo-ics/pom.xml | 4 +++- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 3 ++- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 3 ++- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 2 +- 19 files changed, 38 insertions(+), 32 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..9d4bcf9 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 3d6cbc0..3c603b2 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 96472ad..8debbf6 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..0bb5683 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..f927537 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5bfdd66..4c515c4 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,12 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ics + jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 8b15a31..939370d 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..29778e4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index f9957c9..4f24980 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..c7bebed 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 846c302..b5c2cd3 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 23f68bd..3dc593d 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 28cf55f..d1db96a 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..4f23437 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 1b72275..788be96 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 910d630..36a40da 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index e5b4e5c..63d500c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0ecf190..f0812c0 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - + 1.0-PROD-SNAPSHOT diff --git a/pom.xml b/pom.xml index fbbe86f..c4793b9 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 From eaecf4b4b73c657e4af1061e3d99ff1413f5df6c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 11 May 2020 23:09:47 +0800 Subject: [PATCH 088/134] pom --- modules/i3plus-pojo-andon/pom.xml | 1 + modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 1 + modules/i3plus-pojo-ics/pom.xml | 2 ++ modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 1 + modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 1 + modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- 13 files changed, 14 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..4988f31 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-andon jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 3d6cbc0..4104107 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-aps jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..9be7e80 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-form jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..53cfea6 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-hardswitch jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5bfdd66..5e5ef03 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -11,6 +11,8 @@ 4.0.0 i3plus-pojo-ics + jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 8b15a31..44c0526 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-jobflow jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..122cb94 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-lac jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 23f68bd..c94172f 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-platform jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 28cf55f..4dd7471 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-ptl jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..c45f09e 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-report jar + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 910d630..94fb42a 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-sweb jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index e5b4e5c..cac0256 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-wms jar - + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0ecf190..af52bb4 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-workflow jar - + 1.0-TEST-SNAPSHOT From de9017ca5cb75efd8a45e48ba7d3073a10c8e91c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 11 May 2020 23:19:35 +0800 Subject: [PATCH 089/134] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 ++-- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 4 ++-- modules/i3plus-pojo-ics/pom.xml | 4 ++-- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 4 ++-- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 4 ++-- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4988f31..4b9154c 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4104107..da2f55a 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 96472ad..a933723 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 9be7e80..c86f822 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 53cfea6..36594a5 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5e5ef03..93dfe19 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ics jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 44c0526..6b17e65 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 122cb94..ff17bee 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index f9957c9..a2bb2df 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 846c302..265f98d 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index c94172f..7545af8 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 4dd7471..c11bfc9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index c45f09e..f941c0d 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 1b72275..069a4e2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 94fb42a..4c7b396 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index cac0256..c6788d4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index af52bb4..5c86a26 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/pom.xml b/pom.xml index fbbe86f..1bef72c 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 8d6ffbb012386f10708b9c95ef0b2f41215640ea Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 12 May 2020 10:39:58 +0800 Subject: [PATCH 090/134] bug:8268;8267;8266;8265 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0323dbd..043e753 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 @@ -3576,8 +3576,7 @@ public class WmsEnumUtil { public enum WMS_STOCK_TYPE { SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), - CUST_SN(30, "客户条码"), - FIRST_MIDDLE_LAST(40, "首中末件"); + CUST_SN(30, "客户条码"); private int value; private String description; From 82af372fc09c0a603e191d313bc51879254ea361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 12 May 2020 11:15:40 +0800 Subject: [PATCH 091/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 ++++++ 2 files changed, 8 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 373ace1..757594f 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 @@ -2568,7 +2568,8 @@ public class MesEnumUtil { IN_MATERIAL_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"); + END_CHECK(30, "尾检"), + EDELIVERY_CHECK(40, "发货"); private int value; private String description; 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 de193d7..979ec7e 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 @@ -946,6 +946,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(qcOrder.getSupplierCode())) { DdlPreparedPack.getStringEqualPack(qcOrder.getSupplierCode(), "supplierCode", packBean); } + if (!StringUtils.isEmpty(qcOrder.getCheckType())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); + } // 时间段查询 if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( @@ -973,6 +976,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); } + if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) { + DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean); + } return packBean; } From 1f5052d679fa2625bffa4103506b44fdddc9e98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 12 May 2020 11:39:48 +0800 Subject: [PATCH 092/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 757594f..c3892e2 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 @@ -2565,17 +2565,19 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - IN_MATERIAL_CHECK(5, "来料检验"), - FIRST_CHECK(10, "首检"), - ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"), - EDELIVERY_CHECK(40, "发货"); + IN_MATERIAL_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"), + FIRST_CHECK(10, "FIRST_CHECK", "首检"), + ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), + END_CHECK(30, "END_CHECK", "尾检"), + EDELIVERY_CHECK(40, "EDELIVERY_CHECK", "发货"); private int value; + private String code; private String description; - MES_QC_CHECK_TYPE(int value, String description) { + MES_QC_CHECK_TYPE(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -2583,6 +2585,8 @@ public class MesEnumUtil { return value; } + public String getCode() {return code;} + public String getDescription() { return description; } From 1f97be30783045095a0ee607b479b36960007ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 12 May 2020 15:15:04 +0800 Subject: [PATCH 093/134] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8=EF=BC=885=E4=B8=AA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/repository/MesQcOrderDetailRepository.java | 16 ++++++++++++++++ .../i3plus/pojo/mes/repository/MesQcOrderRepository.java | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java new file mode 100644 index 0000000..794d6ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.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.MesQcOrderDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesQcOrderDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java new file mode 100644 index 0000000..f503196 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.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.MesQcOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesQcOrderRepository extends BaseRepository { +} From 34a3598508b835ac31a2ce8e42e341c1fc000ca7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 12 May 2020 16:04:41 +0800 Subject: [PATCH 094/134] bug:8385 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 +++++++++++ .../i3plus/pojo/wms/bean/WmsPartItemCheck.java | 2 +- .../wms/modelbean/WmsReportTransDetailModel.java | 91 ++++++++++++++++++++++ .../wms/modelbean/WmsReportTransMasterModel.java | 57 ++++++++++++++ .../wms/modelbean/WmsVendorDelayDetailModel.java | 74 ++++++++++++++++++ .../wms/modelbean/WmsVendorDelayMasterModel.java | 41 ++++++++++ 6 files changed, 309 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.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 043e753..38335fd 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 @@ -6574,4 +6574,49 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * BatchHold 物料检测标准值 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_PART_CHECK_STD { + NUMBER(1, "NORMAL", "合格"), + TEXT(2, "ABNORMAL", "不合格"); + + private int value; + private String code; + private String description; + + BH_PART_CHECK_STD(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/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index fce1683..a0ef402 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 @@ -62,7 +62,7 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "STANDARD") @ApiParam("标准值") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD") private Integer standard; @Column(name = "MAX") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java new file mode 100644 index 0000000..460ec08 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; + +/** + * @Description : 报工事务明细表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Entity +@Api("报工事务明细表model") +public class WmsReportTransDetailModel extends BaseBean { + @ApiParam(value = "报工产线") + private String lineNo; + + @ApiParam(value = "实际报工产线") + private String reportLine; + + @ApiParam(value = "班组名称") + private String shiftNo; + + @ApiParam(value = "班组描述") + private String shiftName; + + @ApiParam(value = "报工库区") + private String zoneNo; + + @ApiParam(value = "报工库位") + private String locateNo; + + @ApiParam(value = "报工条码") + private String reportSn; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "客户代码") + private String custNo; + + @ApiParam(value = "单位") + private String unit; + + @ApiParam(value = "数量") + private Double qty; + + @ApiParam(value = "包规") + private String dateCode; + + @ApiParam(value = "供应商批次") + private Double snp; + + @ApiParam(value = "收货批次") + private String lotNo; + + // , String createUser, String createDateTime + public WmsReportTransDetailModel(String organizeCode, String lineNo, String actualReportLine, String shiftNo, String shiftName, + String zoneNo, String locateNo, String sn, String partNo, String partNameRdd, String custNo, + String unit, Double qty, String dateCode, Double snp, String lotNo) { + this.organizeCode = organizeCode; + this.lineNo = lineNo; + this.reportLine = actualReportLine; + this.shiftNo = shiftNo; + this.shiftName = shiftName; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.reportSn = sn; + this.partNo = partNo; + this.partName = partNameRdd; + this.custNo = custNo; + this.unit = unit; + this.qty = qty; + this.dateCode = dateCode; + this.snp = snp; + this.lotNo = lotNo; + } + + public WmsReportTransDetailModel() { + + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java new file mode 100644 index 0000000..b4a467c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; + +/** + * @Description : 报工事务汇总表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Entity +@Api("报工事务汇总表model") +public class WmsReportTransMasterModel extends BaseBean { + @ApiParam(value = "实体线") + private String lineNo; + + @ApiParam(value = "班组名称") + private String shiftNo; + + @ApiParam(value = "班组描述") + private String shiftName; + + @ApiParam(value = "报工库区") + private String zoneNo; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "报工数量") + private Double qty; + + public WmsReportTransMasterModel(String organizeCode, String lineNo, String shiftNo, String shiftName, + String zoneNo, String partNo, String partNameRdd, Double qty) { + this.organizeCode = organizeCode; + this.lineNo = lineNo; + this.shiftNo = shiftNo; + this.shiftName = shiftName; + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partName = partNameRdd; + this.qty = qty; + } + + public WmsReportTransMasterModel() { + + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java new file mode 100644 index 0000000..beca2d3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; + +/** + * @Description : 供应商延迟到货明细表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Entity +@Api("供应商延迟到货明细表model") +public class WmsVendorDelayDetailModel extends BaseBean { + + @ApiParam(value = "单据编号") + private String orderNo; + + @ApiParam(value = "完成状态") + private Integer itemStatus; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件名称") + private String partName; + + @ApiParam(value = "总数量") + private Double qty; + + @ApiParam(value = "预交日期") + private String planDate; + + @ApiParam(value = "预交时间") + private String planTime; + + @ApiParam(value = "收货日期") + private String recDate; + + @ApiParam(value = "收货时间") + private String recTime; + + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "供应商名称") + private String vendorName; + + public WmsVendorDelayDetailModel(String orderNo, Integer itemStatus, String partNo, String partName, Double qty, + String planDate, String planTime, String recDate, String recTime, String vendorNo, String vendorName, String organizeCode) { + this.orderNo = orderNo; + this.itemStatus = itemStatus; + this.partNo = partNo; + this.partName = partName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.recDate = recDate; + this.recTime = recTime; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + setOrganizeCode(organizeCode); + } + + public WmsVendorDelayDetailModel() { + + } +} 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 new file mode 100644 index 0000000..d0b14b6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; + +/** + * @Description : 供应商延迟到货汇总表model + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-05-11 + * @Modify: + **/ +@Data +@Entity +@Api("供应商延迟到货汇总表model") +public class WmsVendorDelayMasterModel extends BaseBean { + + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "供应商名称") + private String vendorName; + + @ApiParam(value = "延迟次数") + private Long delayCount; + + public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode) { + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.delayCount = count; + setOrganizeCode(organizeCode); + } + + public WmsVendorDelayMasterModel() { + + } +} From 5d9f37ee3388def46a5f2d1dd03ad59e6e42bb78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 12 May 2020 16:14:51 +0800 Subject: [PATCH 095/134] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=86=E7=BB=84=E6=9F=A5=E8=AF=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=BB=84=E4=BB=B6SQL=20=EF=BC=9A=E5=85=BC=E5=AE=B9SQL?= =?UTF-8?q?server=E6=95=B0=E6=8D=AE=E5=BA=93=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/WmsActionModule.java | 1 + 1 file changed, 1 insertion(+) 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 d43b2d8..28efa4f 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 @@ -59,6 +59,7 @@ public class WmsActionModule extends BaseBean { @AnnoOutputColumn public Integer isShowInfo; + @Column(name = "OP_TYPE_NAME", columnDefinition = "varchar(225) default ''") @ApiParam(value = "作业类型名称") public String opTypeName; From a6e9b90026a867e760be92bd1c657ae7d32d96ad Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 12 May 2020 16:28:19 +0800 Subject: [PATCH 096/134] pom --- modules/i3plus-pojo-andon/pom.xml | 1 - modules/i3plus-pojo-aps/pom.xml | 1 - modules/i3plus-pojo-base/pom.xml | 1 - modules/i3plus-pojo-form/pom.xml | 1 - modules/i3plus-pojo-hardswitch/pom.xml | 1 - modules/i3plus-pojo-ics/pom.xml | 1 - modules/i3plus-pojo-jobflow/pom.xml | 1 - modules/i3plus-pojo-lac/pom.xml | 1 - modules/i3plus-pojo-mes-pcn/pom.xml | 1 - modules/i3plus-pojo-mes/pom.xml | 1 - modules/i3plus-pojo-model/pom.xml | 1 - modules/i3plus-pojo-platform/pom.xml | 1 - modules/i3plus-pojo-ptl/pom.xml | 1 - modules/i3plus-pojo-report/pom.xml | 1 - modules/i3plus-pojo-softswitch/pom.xml | 1 - modules/i3plus-pojo-sweb/pom.xml | 1 - modules/i3plus-pojo-wms/pom.xml | 1 - modules/i3plus-pojo-workflow/pom.xml | 1 - 18 files changed, 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4b9154c..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-andon jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index da2f55a..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-aps jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a933723..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-base jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c86f822..a9e288f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-form jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 36594a5..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-hardswitch jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 93dfe19..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-ics jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6b17e65..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-jobflow jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ff17bee..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-lac jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a2bb2df..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-mes-pcn jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..60fc467 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 265f98d..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-model jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 7545af8..a785f21 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-platform jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index c11bfc9..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-ptl jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index f941c0d..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-report jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 069a4e2..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-softswitch jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 4c7b396..0368700 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-sweb jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index c6788d4..b2eedd4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-wms jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5c86a26..5fcd08a 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-workflow jar - 1.0-DEV-SNAPSHOT From 222ba4f8a4031f42a277e55d32cba4d2497fd82c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 12 May 2020 17:49:54 +0800 Subject: [PATCH 097/134] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1825=20plc?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=B1=9E=E6=80=A7=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/MesPlc.java | 4 ++++ 1 file changed, 4 insertions(+) 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 4d2fc73..fc99205 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 @@ -130,6 +130,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("密码") private String password; + @Column(name = "DEFAULT_RULE") + @ApiParam("默认赋值属性") + private String defaultRule; + @Transient @ApiParam("设备名称") private String equipmentName; From 0bafa0de52861f4d9c99e9bdc3d604720913c215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 12 May 2020 18:13:08 +0800 Subject: [PATCH 098/134] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=BB=84=E4=BB=B6=E6=A8=A1=E6=9D=BF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java | 4 ++++ 1 file changed, 4 insertions(+) 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 d8b72ec..fdcf3d7 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 @@ -39,6 +39,10 @@ public class WmsThymeleaf extends BaseBean { @ApiParam("模板描述") private String tlDesc; + @Column(name = "PROMPT_MSG") + @ApiParam("引导消息") + private String promptMsg; + @Lob @Column(name = "TL_CONTENT", columnDefinition = "TEXT") @ApiParam(value = "模板内容") From de9c901a3b2b0bf5d652caf6a29fefee36730378 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 12 May 2020 18:19:20 +0800 Subject: [PATCH 099/134] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1826=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E7=A8=8B=E9=85=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesPartStockSchedule.java | 60 ++++++++++++++++++++++ .../repository/MesPartStockScheduleRepository.java | 15 ++++++ 2 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java 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 new file mode 100644 index 0000000..2d24638 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.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: + * @Author: jokelin + * @Date: 2020/5/12 5:53 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_STOCK_SCHEDULE") +@Api("MES_库存排程配置") +public class MesPartStockSchedule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8265586624645977526L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "MIN_CAPACITY") + @ApiParam("最小库存") + private Integer minCapacity; + + @Column(name = "TOTAL_CAPACITY") + @ApiParam("总容量") + private Integer totalCapacity; + + @Column(name = "STANDARD_CAPACITY") + @ApiParam("标准值") + private Integer standardCapacity; + + @Column(name = "SCHEDULE_CAPACITY") + @ApiParam("待生产箱数") + private Integer scheduleCapacity; + + @Column(name = "PLAN_QTY") + @ApiParam("产品JSP个数") + private Integer planQty; + + @Column(name = "TOTAL_PLAN_QTY") + @ApiParam("JSP总数") + private Integer totalPlanQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java new file mode 100644 index 0000000..fc15bd5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.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.MesPartStockSchedule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/5/12 5:57 下午 + * @Modify: + */ +@Repository +public interface MesPartStockScheduleRepository extends BaseRepository { +} From 24ea607718ec878526be7913ba481fe2a81af44b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 12 May 2020 19:01:13 +0800 Subject: [PATCH 100/134] =?UTF-8?q?=E3=80=908441=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/PrintOrderDataModel.java | 29 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 12 +++++++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 12 +++++++-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 12 +++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index 417c5f1..57c8ee6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -73,6 +73,35 @@ public class PrintOrderDataModel implements Serializable { @Transient public String containerNo; + @ApiParam("道口") + @Transient + public String dock; + + @ApiParam("泊位") + @Transient + public String zdoc; + + @Transient + @ApiParam("计划交货日期") + private String planDate; + + @Transient + @ApiParam("计划交货时间") + private String planTime; + + @Transient + @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient + public String createDateTime; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); 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 7ccc46c..0600820 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 @@ -10,7 +10,11 @@ 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.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -115,10 +119,14 @@ public class WmsASNMaster extends BaseBean { @ApiParam("备注") public String remark; - @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") + @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @ApiParam("道口") public String dock; + @ApiParam("泊位") + @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''") + public String zdoc; + @Transient @ApiParam("供应商电话") private String vendorCall; 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 681ae56..e18d087 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 @@ -10,7 +10,11 @@ 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.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -159,10 +163,14 @@ public class WmsPOMaster extends BaseBean { @Transient private List orderNoList; - @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") + @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @ApiParam("道口") public String dock; + @ApiParam("泊位") + @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''") + public String zdoc; + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } 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 55dd8fd..ad85d11 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 @@ -279,6 +279,12 @@ public class WmsHqlPack { DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); } + //按创建时间查询单据信息 + if (StringUtils.isNotBlank(wmsPOMaster.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(), + wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + } + getStringBuilderPack(wmsPOMaster, result); return result; @@ -693,6 +699,12 @@ public class WmsHqlPack { DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result); } + //按创建时间查询单据信息 + if (StringUtils.isNotBlank(wmsASNMaster.getCreateDateTimeStart())) { + DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(), + wmsASNMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + } + getStringBuilderPack(wmsASNMaster, result); return result; From e8dd3ab12f16ca33d9a7d066013815978e8a1346 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 13 May 2020 09:00:04 +0800 Subject: [PATCH 101/134] =?UTF-8?q?8481=20=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE-=E5=BA=93=E4=BD=8D-=E5=AF=BC=E5=85=A5=E3=80=82?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99,=E6=8F=90=E7=A4=BAcn.estsh?= =?UTF-8?q?.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE=5FTYPE.descriptio?= =?UTF-8?q?nOfValue(java.lang.String)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 14 +- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 181 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsStockInitialize.java | 6 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 18 +- .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 2 + 5 files changed, 215 insertions(+), 6 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 01ad320..f7847e2 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 @@ -2212,6 +2212,16 @@ public class CommonEnumUtil { return tmp; } + public static int descriptionOfValue(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 FIELD_TYPE codeOf(Integer value) { for (int i = 0; i < values().length; i++) { if (values()[i].value == value) { @@ -2325,7 +2335,7 @@ public class CommonEnumUtil { return tmp; } - public static Integer valueOfDescription(String desc) { + public static Integer descriptionOfValue(String desc) { Integer tmp = 1; for (int i = 0; i < values().length; i++) { if (values()[i].description.equals(desc)) { @@ -2391,7 +2401,7 @@ public class CommonEnumUtil { } - public static Integer valueOfDescription(String desc) { + public static Integer descriptionOfValue(String desc) { Integer tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].description.equals(desc)) { 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 043e753..50366a9 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 @@ -538,6 +538,14 @@ public class WmsEnumUtil { return code; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -1085,6 +1093,10 @@ public class WmsEnumUtil { return valueOf(val); } + public static Integer descriptionOfValue(String desc) { + return descOf(desc); + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -1250,6 +1262,9 @@ public class WmsEnumUtil { return tmp; } + public static Integer descriptionOfValue(String desc) { + return descOf(desc); + } public static String valueOfDescription(int val) { return valueOf(val); } @@ -3325,6 +3340,17 @@ public class WmsEnumUtil { } return tmp; } + + + public static String descriptionOfValue(String desc) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -4801,6 +4827,17 @@ public class WmsEnumUtil { } return tmp; } + + public static int descriptionOfValue(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; + } + } /** @@ -6574,4 +6611,148 @@ public class WmsEnumUtil { return valueOf(val); } } + + + /** + * BH检测结果类型 RepairOrPick + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_TEST_RESULT_TYPE { + PICK(10, "NORMAL", "挑选"), REPAIR(20, "ABNORMAL", "返修"); + private int value; + private String code; + private String description; + + BH_TEST_RESULT_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); + } + + 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 BH_TEST_RESULT_TYPE 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; + } + } + + + /** + * BH检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_TEST_RESULT_STATUS { + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"); + private int value; + private String code; + private String description; + + BH_TEST_RESULT_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 BH_TEST_RESULT_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; + } + } } 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 515de40..d2ea6db 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 @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; 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; @@ -89,7 +89,7 @@ public class WmsStockInitialize extends BaseBean { @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") @ColumnDefault("10") - @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description", required = false) + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description", required = false) private Integer qcStatus; /** @@ -98,7 +98,7 @@ public class WmsStockInitialize extends BaseBean { @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") @ColumnDefault("30") - @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description", required = false) + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description", required = false) private Integer snStatus; @Column(name = "USE_COUNT", nullable = true) 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 a0d1272..3be68de 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 @@ -14,7 +14,11 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; @@ -212,6 +216,18 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE") private Integer snType = 10; + @Column(name = "USE_COUNT") + @ApiParam(value = "领用次数", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer useCount; + + @Column(name = "SEQ_NO") + @ApiParam(value = "序号", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer seqNo; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; 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 e564dc9..3ff22dd 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 @@ -65,6 +65,7 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "REWORK_RESULT") @ApiParam("返修结果") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description") public Integer reworkResult; @Column(name = "PICK_STATUS") @@ -74,6 +75,7 @@ public class WmsTestResultSummary extends BaseBean { @Column(name = "PICK_RESULT") @ApiParam("挑选结果") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description") public Integer pickResult; } From 8d386caa71967d9d72a0ae547354d3c977e411c0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 13 May 2020 09:36:33 +0800 Subject: [PATCH 102/134] =?UTF-8?q?1776=20=E5=B7=A5=E8=A3=85=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96-=E6=96=B0=E5=A2=9E=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E4=B8=8E=E5=BA=93=E4=BD=8D=E5=8C=B9=E9=85=8D=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 11 +++++++++++ 1 file changed, 11 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 a0d1272..2987077 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 @@ -212,6 +212,17 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE") private Integer snType = 10; + @ApiParam(value = "领用次数", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer useCount; + + @Column(name = "SEQ_NO") + @ApiParam(value = "序号", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer seqNo; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 00df3134b20e8fa2442bfabdb5d309a206f4ebaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 13 May 2020 11:11:53 +0800 Subject: [PATCH 103/134] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=90182?= =?UTF-8?q?9=E3=80=91-=E6=9B=B4=E6=96=B0=E6=A3=80=E6=B5=8B=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E6=A3=80=E6=B5=8B=E5=8D=95=E6=98=8E=E7=BB=86=E5=AE=9E?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 11 +++++++---- .../estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 19 +++++++------------ 2 files changed, 14 insertions(+), 16 deletions(-) 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 dcc8eed..59f5e0f 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 @@ -12,7 +12,6 @@ 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.math.BigDecimal; @@ -52,6 +51,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("数量") private BigDecimal qty; + @Column(name = "FINISH_QTY") + @ApiParam("已检数量") + private BigDecimal finishQty; + @Column(name = "UNIT") @ApiParam("单位") private String unit; @@ -84,7 +87,7 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("检测整体结果") private Integer checkResult; - @Transient - @ApiParam("供应商名称") - private String supplierName; + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; } 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 599196a..3816286 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 @@ -12,7 +12,6 @@ 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; /** @@ -63,23 +62,19 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("是否允许让步") private String isConcession; - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - @Column(name = "CHECK_RESULT") - @ApiParam("检测整体结果") + @ApiParam("检测结果") private Integer checkResult; @Column(name = "CHECK_VALUE") @ApiParam("检测值") private String checkValue; - @Transient - @ApiParam("本批次生产总数") - private Integer currentLotNoSum; + @Column(name = "ITEM_NO") + @ApiParam("检验行号") + private Integer itemNo; - @Transient - @ApiParam("收货批次") - private String srcLotNo; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; } From c4510fb121e4727bc4e300c822f80c4cf9a86869 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 13 May 2020 11:56:27 +0800 Subject: [PATCH 104/134] =?UTF-8?q?BUG=20#8485,=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90-=E6=9F=A5=E8=AF=A2=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E7=A6=81=E7=94=A8=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 7 ++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index e85f93d..f51ab6a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -141,6 +141,14 @@ public abstract class BaseBean implements Serializable { //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid.intValue(); + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + } + //排序方式 public String orderBy(){ String result = ""; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index c397de1..0abeacf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -68,6 +68,22 @@ public class DdlPackBean { return result; } + /** + * 查询指定组织、指定是否有效的数据 + * @param organizeCode + * @param isValid + * @return + */ + public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(isValid,"isValid",result); + DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + + return result; + } + public static DdlPackBean getDdlPackBean(){ DdlPackBean result = new DdlPackBean(); 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 de193d7..de26317 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 @@ -2700,7 +2700,12 @@ public class MesHqlPack { } public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPackBean packBean; + if(dataAuth.getIsValidVal() == 0) { + packBean = DdlPackBean.getDdlPackBean(organizeCode); + } else { + packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal()); + } if (!StringUtils.isEmpty(dataAuth.getDataObject())) { DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean); } From 6b9b2e8dd2f6c5a3f4266a60d34a5973cc97192c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 13 May 2020 13:22:55 +0800 Subject: [PATCH 105/134] =?UTF-8?q?BUG#8438=E3=80=9020011--=20=E5=85=AD?= =?UTF-8?q?=E5=90=88=E4=B8=80=E6=94=B9=E6=95=B0=E6=8C=89=E9=92=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=8C=E6=89=93=E5=BC=80=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=8E=E6=95=B0=E9=87=8F=E4=BC=9A=E7=B4=AF?= =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E4=B8=8B=E6=96=B9=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=AE=A9=E7=94=A8=E6=88=B7=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E9=87=8F--0515=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- 1 file changed, 2 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 edc5ba7..aa23984 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 @@ -1093,7 +1093,7 @@ public class WmsEnumUtil { return valueOf(val); } - public static Integer descriptionOfValue(String desc) { + public static int descriptionOfValue(String desc) { return descOf(desc); } @@ -1262,7 +1262,7 @@ public class WmsEnumUtil { return tmp; } - public static Integer descriptionOfValue(String desc) { + public static int descriptionOfValue(String desc) { return descOf(desc); } public static String valueOfDescription(int val) { From 60973a3ee0153ba1fc9e50dfd1f19eefa7e2af19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 13 May 2020 14:03:06 +0800 Subject: [PATCH 106/134] =?UTF-8?q?=E3=80=901804=20=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=A3=80=E6=B5=8B-=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ++++++++++++++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 79 ++++++++++++++- .../cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 89 +++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java | 64 ++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 110 +++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 85 ++++++++++++++++ .../i3plus/pojo/mes/model/IfQcOrderDataModel.java | 94 ++++++++++++++++++ .../pojo/mes/repository/IfQcOrderRepository.java | 15 +++ .../pojo/mes/repository/IfQcResultRepository.java | 14 +++ .../mes/repository/MesQcOrderDetailRepository.java | 14 +++ .../pojo/mes/repository/MesQcOrderRepository.java | 14 +++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 19 ++++ 12 files changed, 670 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index cdb17df..fb951e6 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 @@ -2580,10 +2580,11 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - + INCOMING_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"); + ND_CHECK(30, "末检"), + RC_CHECK(40, "发货检验"); private int value; private String description; @@ -5572,4 +5573,76 @@ public class MesEnumUtil { } } + /** + * 质检单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + CREATE(10, "创建"), + RECEIPT(20, "执行中"), + SUBMISSION(30, "提交"), + COMPLETE(40, "完成"); + + private int value; + private String description; + + QC_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; + } + } + + /** + * 接口读取标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IN_READ_FLAG { + NOTREAD(0, "未读取"), + READ(1, "已读取"); + + private int value; + private String description; + + IN_READ_FLAG(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/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 900dbb7..6ed4888 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 @@ -925,10 +925,11 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - + INCOMING_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"); + END_CHECK(30, "末检"), + RC_CHECK(40, "发货检验"); private int value; private String description; @@ -3564,4 +3565,78 @@ public class MesPcnEnumUtil { return description; } } + + /** + * 质检单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + CREATE(10, "创建"), + RECEIPT(20, "执行中"), + SUBMISSION(30, "提交"), + COMPLETE(40, "完成"); + + private int value; + private String description; + + QC_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; + } + } + + /** + * 整体检测结果状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_REULST { + + PASS(10, "通过"), + NON_PASS(20, "不通过"), + CONCESSION_PRODUCTION(30, "让步生产"); + + private int value; + private String description; + + CHECK_REULST(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-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 new file mode 100644 index 0000000..cb47ab9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -0,0 +1,89 @@ +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: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_QC_ORDER") +@Api("IF_质检单") +public class IfQcOrder extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0D; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuid; + + @Column(name = "ORGANIZTION_CODE") + @ApiParam("工厂代码") + private String organiztionCode; + + @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/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 new file mode 100644 index 0000000..186a0ac --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java @@ -0,0 +1,64 @@ +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: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_QC_RESULT") +@Api("IF_质检结果") +public class IfQcResult extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuid; + + @Column(name = "QC_RESULT") + @ApiParam("质检结果") + private String qcResult; + + @Column(name = "ORGANIZTION_CODE") + @ApiParam("工厂代码") + private String organiztionCode; + + @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/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 new file mode 100644 index 0000000..c8b26e6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -0,0 +1,110 @@ +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: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER") +@Api("MES_检验单") +public class MesQcOrder extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "FINISH_QTY") + @ApiParam("已检数量") + private Double finishQty = 0D; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0D; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuid; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CHECK_REULST") + @ApiParam("检测整体结果") + private Integer checkReulst = 0; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @ApiParam(value = "检测结果") + @Transient + private String reulstStatus; + + @ApiParam(value = "产品条码") + @Transient + private String serialNumber; + + @ApiParam(value = "产线") + @Transient + private String workCenterCode; + + @ApiParam(value = "工单号") + @Transient + private String mesWorkNo; + +} 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 new file mode 100644 index 0000000..ea263b4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -0,0 +1,85 @@ +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: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER_DETAIL") +@Api("MES_检验单明细") +public class MesQcOrderDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @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 = "IS_CONCESSION") + @ApiParam("是否允许让步") + private Integer isConcession = 0; + + @Column(name = "CHECK_REULST") + @ApiParam("判定结果") + private Integer checkReulst = 0; + + @Column(name = "ITEM_NO") + @ApiParam("检验行号") + private Integer itemNo = 0; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + + @ApiParam(value = "已完成数量") + @Transient + private Integer finishQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java new file mode 100644 index 0000000..ad18404 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java @@ -0,0 +1,94 @@ +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.NoArgsConstructor; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\18 9:34 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("QC质检单model") +public class IfQcOrderDataModel extends BaseBean { + + @ApiParam("ruid") + private Long ruid; + + @ApiParam("收货流水号") + private Long uuid; + + @ApiParam("域") + private String werks; + + @ApiParam("地点") + private String lgort; + + @ApiParam("收货库位") + private String wlbrt; + + @ApiParam("单据号") + private String refid; + + @ApiParam("行号") + private Integer zeile; + + @ApiParam("业务类型") + private String action; + + @ApiParam("供应商编码") + private String lifnr; + + @ApiParam("物料编码") + private String matnr; + + @ApiParam("收货数量") + private String erfmg; + + @ApiParam("计量单位") + private String erfme; + + @ApiParam("检验编号") + private String chkno; + + @ApiParam("炉批号") + private String stono; + + @ApiParam("收货日期") + private String zpost; + + @ApiParam("收货时间") + private String ztime; + + @ApiParam("添加日期") + private String addtimeYmd; + + @ApiParam("添加时间") + private String addtimeHms; + + @ApiParam("处理日期") + private String finishtimeYmd; + + @ApiParam("处理时间") + private String finishtimeHms; + + @ApiParam("删除标记") + private Integer deleteFlag; + + @ApiParam("读取标识") + private Integer readFlag; + + @ApiParam("错误代码") + private String errCode; + + @ApiParam("错误信息") + private String errMsg; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java new file mode 100644 index 0000000..64fe700 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.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.IfPackageDetail; +import cn.estsh.i3plus.pojo.mes.bean.IfQcOrder; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfQcOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java new file mode 100644 index 0000000..1b3b78f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.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.IfQcResult; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfQcResultRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java new file mode 100644 index 0000000..bda45b5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.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.MesQcOrderDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java new file mode 100644 index 0000000..f9ff6c8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.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.MesQcOrder; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderRepository extends BaseRepository { +} 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 da8091d..e54b01b 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.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.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; @@ -437,4 +438,22 @@ public class MesPcnHqlPack { return packBean; } + + /** + * 获取工作中心下所有的投料数据 + * + * @param mesQcOrderDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQcOrderDetail(MesQcOrderDetail mesQcOrderDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean); + DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean); + if(mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()){ + DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty()+1, "itemNo", packBean); + } + return packBean; + } } From c0f5709bb24ab33d334c0ab45a985117ecb70ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 13 May 2020 14:13:32 +0800 Subject: [PATCH 107/134] =?UTF-8?q?=E3=80=90=E5=90=88=E5=B9=B6=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 19ee9a3..092c66b 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 @@ -33,7 +33,7 @@ public class MesEnumUtil { this.description = description; } - public int getValue() { + public String getValue() { return value; } From d86cdfe4ff3fe4708fd43ee3e0fe180c233e6361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 13 May 2020 14:22:52 +0800 Subject: [PATCH 108/134] =?UTF-8?q?OPC=20UA=20=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/bean/DdlPackBean.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index c397de1..5f46866 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import java.util.HashMap; -import java.util.Map; /** * @Description : hql脚本封装类 @@ -63,7 +62,7 @@ public class DdlPackBean { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); - DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); return result; } From 6fbfea417f0b9bb6a7f0fce5399a95114b2bb998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 13 May 2020 14:27:35 +0800 Subject: [PATCH 109/134] =?UTF-8?q?=E3=80=901804=20=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=A3=80=E6=B5=8B-=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java | 2 +- 2 files changed, 2 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 092c66b..88836d3 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 @@ -2567,7 +2567,7 @@ public class MesEnumUtil { INCOMING_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - ND_CHECK(30, "末检"), + END_CHECK(30, "末检"), RC_CHECK(40, "发货检验"); private int value; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java index ad18404..c3f6856 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java @@ -51,7 +51,7 @@ public class IfQcOrderDataModel extends BaseBean { private String matnr; @ApiParam("收货数量") - private String erfmg; + private Double erfmg; @ApiParam("计量单位") private String erfme; From dfce22d65427ea0ad6fe5a5ecde94d68f196e197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 13 May 2020 14:36:52 +0800 Subject: [PATCH 110/134] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=90192?= =?UTF-8?q?8=E3=80=91-=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B=E5=8D=95-?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= 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, 12 insertions(+), 6 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 88836d3..e560fb7 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 @@ -2564,17 +2564,19 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - INCOMING_CHECK(5, "来料检验"), - FIRST_CHECK(10, "首检"), - ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "末检"), - RC_CHECK(40, "发货检验"); + INCOMING_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"), + FIRST_CHECK(10, "FIRST_CHECK", "首检"), + ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), + END_CHECK(30, "END_CHECK", "末检"), + RC_CHECK(40, "EDELIVERY_CHECK", "发货检验"); private int value; + private String code; private String description; - MES_QC_CHECK_TYPE(int value, String description) { + MES_QC_CHECK_TYPE(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -2582,6 +2584,10 @@ public class MesEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } From a4551a746a0bdb9b91276d506203d59b5a1e0c1c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 13 May 2020 14:42:34 +0800 Subject: [PATCH 111/134] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9DdlPackBean=E6=9F=A5=E8=AF=A2=20->=20=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E4=BB=A3=E7=A0=81=E5=8F=AF=E4=BB=A5=E6=98=AF=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E6=88=96=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 0abeacf..8cc0971 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -63,7 +63,7 @@ public class DdlPackBean { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); - DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); return result; } @@ -79,7 +79,7 @@ public class DdlPackBean { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(isValid,"isValid",result); - DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); return result; } From f1d14c9e3a2b3bba6e226572445c0f20cac26d2b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 13 May 2020 14:49:12 +0800 Subject: [PATCH 112/134] =?UTF-8?q?bug:=E3=80=908385=E3=80=91-=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E4=BA=8B=E5=8A=A1=E6=9F=A5=E8=AF=A2=E8=81=94=E8=B0=83?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java | 9 ++++++++- .../i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java | 11 +++++++++-- .../i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 11 +++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java index 460ec08..2b2fed2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java @@ -63,10 +63,16 @@ public class WmsReportTransDetailModel extends BaseBean { @ApiParam(value = "收货批次") private String lotNo; + @ApiParam(value = "查询开始时间") + private String startDateTime; + + @ApiParam(value = "查询结束时间") + private String endDateTime; + // , String createUser, String createDateTime public WmsReportTransDetailModel(String organizeCode, String lineNo, String actualReportLine, String shiftNo, String shiftName, String zoneNo, String locateNo, String sn, String partNo, String partNameRdd, String custNo, - String unit, Double qty, String dateCode, Double snp, String lotNo) { + String unit, Double qty, String dateCode, Double snp, String lotNo, String createDateTime) { this.organizeCode = organizeCode; this.lineNo = lineNo; this.reportLine = actualReportLine; @@ -83,6 +89,7 @@ public class WmsReportTransDetailModel extends BaseBean { this.dateCode = dateCode; this.snp = snp; this.lotNo = lotNo; + this.createDatetime = createDateTime; } public WmsReportTransDetailModel() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java index beca2d3..915567e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java @@ -52,8 +52,14 @@ public class WmsVendorDelayDetailModel extends BaseBean { @ApiParam(value = "供应商名称") private String vendorName; + @ApiParam(value = "查询开始时间") + private String startDateTime; + + @ApiParam(value = "查询结束时间") + private String endDateTime; + public WmsVendorDelayDetailModel(String orderNo, Integer itemStatus, String partNo, String partName, Double qty, - String planDate, String planTime, String recDate, String recTime, String vendorNo, String vendorName, String organizeCode) { + String planDate, String planTime, String recDate, String recTime, String vendorNo, String vendorName, String organizeCode, String createDateTime) { this.orderNo = orderNo; this.itemStatus = itemStatus; this.partNo = partNo; @@ -65,7 +71,8 @@ public class WmsVendorDelayDetailModel extends BaseBean { this.recTime = recTime; this.vendorNo = vendorNo; this.vendorName = vendorName; - setOrganizeCode(organizeCode); + this.organizeCode = organizeCode; + this.createDatetime = createDateTime; } public WmsVendorDelayDetailModel() { 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 d0b14b6..3166ac2 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 @@ -28,11 +28,18 @@ public class WmsVendorDelayMasterModel extends BaseBean { @ApiParam(value = "延迟次数") private Long delayCount; - public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode) { + @ApiParam(value = "查询开始时间") + private String startDateTime; + + @ApiParam(value = "查询结束时间") + private String endDateTime; + + public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) { this.vendorNo = vendorNo; this.vendorName = vendorName; this.delayCount = count; - setOrganizeCode(organizeCode); + this.organizeCode = organizeCode; + this.createDatetime = createDateTime; } public WmsVendorDelayMasterModel() { From c38757de195514b7557ab5a2b6fcf34c65982cae Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 13 May 2020 15:43:30 +0800 Subject: [PATCH 113/134] =?UTF-8?q?=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 113 +++++++++++---------- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 101 ++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 20 ++-- .../i3plus/pojo/wms/bean/WmsLogisticsCosts.java | 80 +++++++++++++++ .../i3plus/pojo/wms/bean/WmsModeTransport.java | 51 ++++++++++ .../i3plus/pojo/wms/bean/WmsProviderFlag.java | 53 ++++++++++ .../pojo/wms/bean/WmsShortLogisticsCosts.java | 90 ++++++++++++++++ .../repository/WmsLogisticsCostsRepository.java | 16 +++ .../wms/repository/WmsModeTransportRepository.java | 16 +++ .../wms/repository/WmsProviderFlagRepository.java | 16 +++ .../WmsShortLogisticsCostsRepository.java | 16 +++ 11 files changed, 506 insertions(+), 66 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.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 f8581ff..0574e44 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 @@ -16,12 +16,11 @@ public class ImppEnumUtil { * 1.集团，2.公司，3.工厂 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORGANIZE_YTPE{ + public enum ORGANIZE_YTPE { - TYPE_GROUP(1,"集团","集团"), - TYPE_COMPANY(2,"公司","公司"), - TYPE_FACTORY(3,"工厂","工厂"), - ; + TYPE_GROUP(1, "集团", "集团"), + TYPE_COMPANY(2, "公司", "公司"), + TYPE_FACTORY(3, "工厂", "工厂"); private int value; private String name; @@ -86,8 +85,8 @@ public class ImppEnumUtil { * 3.权限CODE */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TASK_METHOD_TYPE{ - CLASS_METHOD(1,"类方法","Java Class 方法"); + public enum TASK_METHOD_TYPE { + CLASS_METHOD(1, "类方法", "Java Class 方法"); // TYPE_COMPANY(2,"链接","Http URL"), // TYPE_FACTORY(3,"权限CODE","权限CODE"); @@ -148,7 +147,7 @@ public class ImppEnumUtil { } /** - * 日志级别 + * 日志级别 * 1.DEBUG：调试程序信息， * 2.INFO：程序运行信息， * 3.WARN：具有潜在危害的信息， @@ -156,13 +155,13 @@ public class ImppEnumUtil { * 5.FATAL：非常严重的错误，可能导致程序中止 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LOG_LEVEL{ + public enum LOG_LEVEL { - DEBUG(1,"DEBUG","调试"), - INFO(2,"INFO","信息"), - WARN(3,"WARN","注意"), - ERROR(4,"ERROR","错误"), - FATAL(5,"FATAL","严重"); + DEBUG(1, "DEBUG", "调试"), + INFO(2, "INFO", "信息"), + WARN(3, "WARN", "注意"), + ERROR(4, "ERROR", "错误"), + FATAL(5, "FATAL", "严重"); private int value; private String name; @@ -238,13 +237,13 @@ public class ImppEnumUtil { * 4.SELECT：查询 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OPERATE_TYPE{ + public enum OPERATE_TYPE { - INSERT(1,"post","新增"), //POST - DELETE(2,"put","修改"), //PUT - UPDATE(3,"delete","删除"), //DELETE - SELECT(4,"get","查询"), //GET - BUSI(5,"busi","处理"); + INSERT(1, "post", "新增"), //POST + DELETE(2, "put", "修改"), //PUT + UPDATE(3, "delete", "删除"), //DELETE + SELECT(4, "get", "查询"), //GET + BUSI(5, "busi", "处理"); private int value; private String name; @@ -317,9 +316,9 @@ public class ImppEnumUtil { * 1.PC：个人计算机 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OPERATE_TERMINAL{ + public enum OPERATE_TERMINAL { - PC(1,"电脑端"),PDA(2,"PDA"),MOBILE(3,"手机"); + PC(1, "电脑端"), PDA(2, "PDA"), MOBILE(3, "手机"); private int value; private String description; @@ -360,8 +359,8 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_STATUS { - READ(1,"已读","fa cell-fa fa-file-text"), - UNREAD(2,"未读","fa cell-fa fa-file-o"); + READ(1, "已读", "fa cell-fa fa-file-text"), + UNREAD(2, "未读", "fa cell-fa fa-file-o"); private int value; private String name; @@ -428,10 +427,10 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_TYPE { - MAIL(1,"邮件","邮件"), - LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"), - SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); private int value; private String name; @@ -498,13 +497,13 @@ public class ImppEnumUtil { * 5.MIDDLE_TABLE：中间表 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TOOL_CONN_TYPE{ + public enum TOOL_CONN_TYPE { - SERIAL_PORT(1,"串口","串口"), - NETWORK_PORT(2,"网口","网口"), - OPC(3,"OPC","OPC"), - USB(4,"USB","USB"), - MIDDLE_TABLE(5,"中间表","中间表"); + SERIAL_PORT(1, "串口", "串口"), + NETWORK_PORT(2, "网口", "网口"), + OPC(3, "OPC", "OPC"), + USB(4, "USB", "USB"), + MIDDLE_TABLE(5, "中间表", "中间表"); private int value; private String name; private String description; @@ -568,11 +567,11 @@ public class ImppEnumUtil { * 3.BINARY_PACKET：二进制数据包 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TOOL_DATA_TYPE{ + public enum TOOL_DATA_TYPE { - STRING(1,"字符串","字符串"), - TABLE(2,"数据表","数据表"), - BINARY_PACKET(3,"二进制数据包","二进制数据包"); + STRING(1, "字符串", "字符串"), + TABLE(2, "数据表", "数据表"), + BINARY_PACKET(3, "二进制数据包", "二进制数据包"); private int value; private String name; @@ -635,9 +634,9 @@ public class ImppEnumUtil { * 1.SYSTEM：系统参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SYS_CONFIG_TYPE{ + public enum SYS_CONFIG_TYPE { - SYSTEM(1,"系统参数","系统参数"); + SYSTEM(1, "系统参数", "系统参数"); private int value; private String name; @@ -702,8 +701,8 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_TYPE_CONTENT { - HTML(1,"HTML","text/html;charset=UTF-8"), - TEXT(2,"TEXT","text/plain;charset=UTF-8"); + HTML(1, "HTML", "text/html;charset=UTF-8"), + TEXT(2, "TEXT", "text/plain;charset=UTF-8"); private int value; private String name; @@ -770,9 +769,9 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DYN_TABLE_CELL_TYPE { - STRING(1,"String","字符串类型"), - NUMBER(2,"Number","数字类型"), - DATE(3,"Date","时间类型"); + STRING(1, "String", "字符串类型"), + NUMBER(2, "Number", "数字类型"), + DATE(3, "Date", "时间类型"); private int value; private String name; @@ -829,6 +828,7 @@ public class ImppEnumUtil { return tmp; } } + /** * 系统值类型 * 1. String @@ -838,12 +838,12 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_VALUE_TYPE { - STRING(1,"text","文本"), - NUMBER(2,"number","数字"), - DATE(3,"date","时间"), - SWITCH(4,"switch","布尔"), - SELECT(5,"select","选择"), - FILE(6,"select","选择"); + STRING(1, "text", "文本"), + NUMBER(2, "number", "数字"), + DATE(3, "date", "时间"), + SWITCH(4, "switch", "布尔"), + SELECT(5, "select", "选择"), + FILE(6, "select", "选择"); private int value; private String name; @@ -910,7 +910,7 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_CACHE_TYPE { - REDIS(1,"Redis","Redis 缓存方式"); + REDIS(1, "Redis", "Redis 缓存方式"); private int value; private String name; @@ -1054,6 +1054,7 @@ public class ImppEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_RECEIVER_TYPE { INTERNAL(1, "内部人员"), @@ -1095,10 +1096,10 @@ public class ImppEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FILE_ATTACH_SOURCE { - MAIL(1,"邮件","邮件"), - LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"), - SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); private int value; private String name; 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 0323dbd..57e1590 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 @@ -6575,4 +6575,105 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 运输方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRANSPORT_TYPE { + LONG_HAUL(10, "长途运输"), + SHORT_DISTANCE(20, "短途运输"); + + private int value; + private String description; + + TRANSPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static TRANSPORT_TYPE 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; + } + + 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 descriptionOfValue(String desc) { + return descOf(desc); + } + } + + /** + * 物流供应商类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOGISTICS_PROVIDER_TYPE { + VENDOR(10, "承运商"); + + private int value; + private String description; + + LOGISTICS_PROVIDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static LOGISTICS_PROVIDER_TYPE 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; + } + } } 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 c632d9f..a9011f4 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 @@ -43,12 +43,12 @@ public class WmsCSOrderMaster extends BaseBean { */ @Column(name = "ORDER_TYPE") @ApiParam(value = "单据类型", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class, refForeignKey = "value", value = "description") public Integer orderType; @Column(name = "ORDER_STATUS") @ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer orderStatus; @Column(name = "ACTION_PERSENT") @@ -61,17 +61,17 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_INVENTORY") @ApiParam(value = "是否允许清点", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isInventory; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; @Column(name = "IS_PART") @ApiParam(value = "是否散件") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isPart; @Column(name = "YEAR") @@ -80,7 +80,7 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_SYNC_ERP") @ApiParam("是否同步ERP") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isSyncErp; @Transient @@ -115,11 +115,11 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "is_obvious") private Integer isObvious; - @ApiParam(value = "允许盘入的库位") - @Column(name = "ALLOW_LOCATES") - private String allowLocates; + // @ApiParam(value = "允许盘入的库位") +// @Column(name = "ALLOW_LOCATES") +// private String allowLocates; public Integer getIsInventoryVal() { - return this.isInventory == null ? 0 :this.isInventory.intValue(); + return this.isInventory == null ? 0 : this.isInventory.intValue(); } } 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 new file mode 100644 index 0000000..04ccb22 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java @@ -0,0 +1,80 @@ +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; +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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_LOGISTICS_COSTS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流费用管理", description = "物流费用管理") +public class WmsLogisticsCosts extends BaseBean { + + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + @Column(name = "PLACE_OF_ORIGIN") + @ApiParam(value = "发出地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String placeOfOrigin; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; + + @Column(name = "LOGISTICS_VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String logisticsVendorNo; + + @Column(name = "SALES_UNIT") + @ApiParam(value = "计价单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String salesUnit; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT) + @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") + private Integer transportType; + + @Column(name = "price") + @ApiParam(value = "单价") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double price; + + @Column(name = "START_DATE") + @ApiParam(value = "生效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String startDate; + + @Column(name = "END_DATE") + @ApiParam(value = "结束日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String endDate; +} 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 new file mode 100644 index 0000000..3cc9ebc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java @@ -0,0 +1,51 @@ +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; +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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_MODE_TRANSPORT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "运输方式", description = "运输方式") +public class WmsModeTransport extends BaseBean { + + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + @Column(name = "ORGANIZE_CODE") + @ApiParam(value = "工厂代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeCode; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") + private Integer transportType; + +} 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 new file mode 100644 index 0000000..3bded5f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java @@ -0,0 +1,53 @@ +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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_PROVIDER_FLAG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流供应商关系", description = "库存物流供应商关系条码信息") +public class WmsProviderFlag extends BaseBean { + + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + + @Column(name = "VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "物流供应商名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String vendorName; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; +} 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 new file mode 100644 index 0000000..1f71f81 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java @@ -0,0 +1,90 @@ +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; +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 : qianhuasheng + * @CreateDate : 2020-05-06 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_LOGISTICS_COSTS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "物流费用管理", description = "物流费用管理") +public class WmsShortLogisticsCosts extends BaseBean { + + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "工厂名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String organizeName; + + @Column(name = "part_no") + @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "part_name") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partName; + + @Column(name = "PLACE_OF_ORIGIN") + @ApiParam(value = "发出地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String placeOfOrigin; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlag; + + @Column(name = "LOGISTICS_VENDOR_NO") + @ApiParam(value = "物流供应商") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String logisticsVendorNo; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT) + @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") + private Integer transportType; + + @Column(name = "SALES_UNIT") + @ApiParam(value = "计价单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String salesUnit; + + @Column(name = "price") + @ApiParam(value = "单价") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double price; + + @Column(name = "START_DATE") + @ApiParam(value = "生效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String startDate; + + @Column(name = "END_DATE") + @ApiParam(value = "结束日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String endDate; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java new file mode 100644 index 0000000..9fa807f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticsCosts; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流费用管理 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsLogisticsCostsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java new file mode 100644 index 0000000..17df50e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsModeTransport; +import org.springframework.stereotype.Repository; + +/** + * @Description : 运输方式 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsModeTransportRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java new file mode 100644 index 0000000..c6446a8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsProviderFlag; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流供应商与发往地关系 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsProviderFlagRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java new file mode 100644 index 0000000..57028b4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsShortLogisticsCosts; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物流费用管理(短途运输) + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsShortLogisticsCostsRepository extends BaseRepository { +} From 7b5736d7171c8ab27bb193fb9659eb0786790a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 13 May 2020 18:38:18 +0800 Subject: [PATCH 114/134] =?UTF-8?q?Task1812:=E4=BB=93=E5=BA=93=E5=81=A5?= =?UTF-8?q?=E5=BA=B7=E5=BA=A6=E6=8C=87=E6=A0=87=E8=A7=86=E5=9B=BE=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8C=87=E6=A0=87=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?(#476)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsHealthIndicator.java | 54 ++++++++++++ .../pojo/wms/bean/WmsHealthIndicatorLevel.java | 64 ++++++++++++++ .../pojo/wms/bean/WmsHealthIndicatorResult.java | 56 +++++++++++++ .../i3plus/pojo/wms/bean/WmsHealthVariable.java | 97 ++++++++++++++++++++++ .../pojo/wms/bean/WmsHealthVariableResult.java | 56 +++++++++++++ .../WmsHealthIndicatorLevelRepository.java | 16 ++++ .../repository/WmsHealthIndicatorRepository.java | 16 ++++ .../WmsHealthIndicatorResultRepository.java | 16 ++++ .../repository/WmsHealthVariableRepository.java | 16 ++++ .../WmsHealthVariableResultRepository.java | 16 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 67 +++++++++++++-- 11 files changed, 469 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java 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 new file mode 100644 index 0000000..9b4ac5c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java @@ -0,0 +1,54 @@ +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 : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_INDICATOR") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度指标",description = "仓库健康度指标") +public class WmsHealthIndicator extends BaseBean { + + private static final long serialVersionUID = 7332606119041273554L; + + @Column(name = "INDICATOR_CODE") + @ApiParam(value = "指标代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorCode; + + @Column(name = "INDICATOR_NAME") + @ApiParam(value = "指标名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorName; + + @Column(name = "GROUP_NAME") + @ApiParam(value = "模块名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String groupName; + + @Column(name = "CALC_FORMULA") + @ApiParam(value = "指标测算公式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String calcFormula; +} 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 new file mode 100644 index 0000000..fd49a58 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java @@ -0,0 +1,64 @@ +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 : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_INDICATOR_LEVEL") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度指标分级",description = "仓库健康度指标分级") +public class WmsHealthIndicatorLevel extends BaseBean { + + private static final long serialVersionUID = 7332606229041273554L; + + @Column(name = "INDICATOR_CODE") + @ApiParam(value = "指标代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorCode; + + @Column(name = "INDICATOR_NAME") + @ApiParam(value = "指标名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorName; + + @Column(name = "INDICATOR_LOWER_LIMIT") + @ApiParam(value = "指标下限") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double indicatorLowerLimit; + + @Column(name = "INDICATOR_UPPER_LIMIT") + @ApiParam(value = "指标上限") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double indicatorUpperLimit; + + @Column(name = "INDICATOR_GRADE") + @ApiParam(value = "指标等级") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorGrade; + + @Column(name = "INDICATOR_COLOR") + @ApiParam(value = "指标颜色") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorColor; +} 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 new file mode 100644 index 0000000..8d051a5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java @@ -0,0 +1,56 @@ +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.Lob; +import javax.persistence.Table; + +/** + * @Description : 仓库健康度指标结果 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_INDICATOR_RESULT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度指标结果",description = "仓库健康度指标结果") +public class WmsHealthIndicatorResult extends BaseBean { + + private static final long serialVersionUID = 7332606339041273554L; + + @Column(name = "INDICATOR_CODE") + @ApiParam(value = "指标代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorCode; + + @Column(name = "INDICATOR_NAME") + @ApiParam(value = "指标名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorName; + + @Column(name = "INDICATOR_VALUE") + @ApiParam(value = "指标测算值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double indicatorValue; + + @Lob + @Column(name = "INDICATOR_DETAILS") + @ApiParam(value = "指标测算明细") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorDetails; +} 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 new file mode 100644 index 0000000..d57680e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java @@ -0,0 +1,97 @@ +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.Lob; +import javax.persistence.Table; + +/** + * @Description : 仓库健康度变量 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_VARIABLE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度变量",description = "仓库健康度变量") +public class WmsHealthVariable extends BaseBean { + + private static final long serialVersionUID = 7332606449041273554L; + + @Column(name = "VARIABLE_CODE") + @ApiParam(value = "变量代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableCode; + + @Column(name = "VARIABLE_NAME") + @ApiParam(value = "变量名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableName; + + @Column(name = "CYCLE_RANGE") + @ApiParam(value = "周期(天)") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer cycleRange; + + @Column(name = "CALC_FREQUENCY") + @ApiParam(value = "计算频次(天)") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer calcFrequency; + + @Column(name = "LAST_CALC_TIME") + @ApiParam(value = "末次计算时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String LastCalcTime; + + @Column(name = "NEXT_CALC_TIME") + @ApiParam(value = "下次计算时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String nextCalcTime; + + @Column(name = "APPLY_AREA") + @ApiParam(value = "适应存储区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String applyArea; + + @Column(name = "APPLY_PART_GROUP") + @ApiParam(value = "适应物料组") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String applyPartGroup; + + @Lob + @Column(name = "VARIABLE_PARAM") + @ApiParam(value = "变量参数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableParam; + + @Lob + @Column(name = "SQL_STATEMENT") + @ApiParam(value = "SQL语句") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String sqlStatement; + + @Column(name = "FUNCTION_NAME") + @ApiParam(value = "方法名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String functionName; + + @Column(name = "SCRIPT_NO") + @ApiParam(value = "脚本编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String scriptNo; +} 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 new file mode 100644 index 0000000..7820d95 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java @@ -0,0 +1,56 @@ +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.Lob; +import javax.persistence.Table; + +/** + * @Description : 仓库健康度变量测算结果 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 13:54 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_HEALTH_VARIABLE_RESULT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="仓库健康度变量测算结果",description = "仓库健康度变量测算结果") +public class WmsHealthVariableResult extends BaseBean { + + private static final long serialVersionUID = 7332606559041273554L; + + @Column(name = "VARIABLE_CODE") + @ApiParam(value = "变量代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableCode; + + @Column(name = "VARIABLE_NAME") + @ApiParam(value = "变量名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableName; + + @Column(name = "VARIABLE_VALUE") + @ApiParam(value = "变量测算值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Double variableValue; + + @Lob + @Column(name = "VARIABLE_DETAILS") + @ApiParam(value = "变量测算明细") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String variableDetails; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java new file mode 100644 index 0000000..43c28ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicatorLevel; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthIndicatorLevelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java new file mode 100644 index 0000000..c197b34 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicator; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthIndicatorRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java new file mode 100644 index 0000000..833dfd2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicatorResult; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthIndicatorResultRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java new file mode 100644 index 0000000..732a108 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsHealthVariable; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthVariableRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java new file mode 100644 index 0000000..58f6f6a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsHealthVariableResult; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-13 15:17 + * @Modify: + **/ +@Repository +public interface WmsHealthVariableResultRepository 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 ad85d11..97c135d 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 @@ -21,11 +21,7 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -3254,4 +3250,65 @@ public class WmsHqlPack { getStringBuilderPack(thymeleaf, result); return result; } + + /** + * 仓库健康指标信息分页查询条件 + * @param healthIndicator + * @return + */ + public static DdlPackBean packHqlWmsHealthIndicator(WmsHealthIndicator healthIndicator) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(healthIndicator.getIndicatorCode(), "indicatorCode", result); + DdlPreparedPack.getStringEqualPack(healthIndicator.getGroupName(), "groupName", result); + getStringBuilderPack(healthIndicator, result); + return result; + } + + /** + * 仓库健康指标分级信息分页查询条件 + * @param healthIndicatorLevel + * @return + */ + public static DdlPackBean packHqlWmsHealthIndicatorLevel(WmsHealthIndicatorLevel healthIndicatorLevel) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(healthIndicatorLevel.getIndicatorCode(), "indicatorCode", result); + getStringBuilderPack(healthIndicatorLevel, result); + return result; + } + + /** + * 仓库健康指标分级信息分页查询条件 + * @param wmsHealthVariable + * @return + */ + public static DdlPackBean packHqlWmsHealthVariable(WmsHealthVariable wmsHealthVariable) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsHealthVariable.getVariableCode(), "variableCode", result); + getStringBuilderPack(wmsHealthVariable, result); + return result; + } + + /** + * 仓库健康指标测算结果信息查询条件 + * @param healthIndicatorResult + * @return + */ + public static DdlPackBean packHqlWmsHealthIndicatorResult(WmsHealthIndicatorResult healthIndicatorResult) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getIndicatorCode(), "indicatorCode", result); + getStringBuilderPack(healthIndicatorResult, result); + return result; + } + + /** + * 仓库健康指标变量测算结果信息查询条件 + * @param healthVariableResult + * @return + */ + public static DdlPackBean packHqlWmsHealthVariableResult(WmsHealthVariableResult healthVariableResult) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(healthVariableResult.getVariableCode(), "variableCode", result); + getStringBuilderPack(healthVariableResult, result); + return result; + } } From 0e5bf3488bf4575c137a948a4d985598249bb661 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 13 May 2020 19:22:11 +0800 Subject: [PATCH 115/134] =?UTF-8?q?=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java | 1 + .../i3plus/pojo/wms/bean/WmsProcurementPlanContract.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java | 1 + .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java | 1 + .../cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 1 + .../i3plus/pojo/wms/engine/rule/EngineRulePersistence.java | 1 + .../pojo/wms/engine/script/EngineScriptPersistence.java | 12 ++++++------ .../wms/engine/script/EngineScriptPersistenceHistory.java | 1 + .../estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java | 1 + .../cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java | 1 + .../pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java | 1 + .../cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java | 2 +- .../estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java | 1 + .../cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java | 4 +++- 41 files changed, 50 insertions(+), 11 deletions(-) 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 6be1fbb..6a4eee3 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("BH子检测项") public class WmsBhChildDetectionItem extends BaseBean { + private static final long serialVersionUID = -8005468634643773682L; @Column(name = "CHECK_TYPE") @ApiParam("检测大类") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") 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 205c3d5..88525bb 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 @@ -34,6 +34,7 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Api(value = "bom历史记录", description = "bom历史记录") public class WmsBomHistory extends BaseBean { + private static final long serialVersionUID = -2781401699752981565L; @Column(name = "PART_NO") @ApiParam(value = "父物料号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 f32d795..fa3d7d1 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 @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api("车辆信息") public class WmsCar extends BaseBean { + private static final long serialVersionUID = -905792638347428695L; @Column(name = "CAR_NO") @ApiParam(value = "车牌号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 90d32ae..95e581d 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 @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="客户窗口时间",description = "客户窗口时间") public class WmsCustWindow extends BaseBean { + private static final long serialVersionUID = -6544671103929721988L; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") private String custNo; 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 711858f..a071ed1 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="客户物料发往地",description = "客户物料发往地") public class WmsCustomerPartShipping extends BaseBean { + private static final long serialVersionUID = 9091356911517332847L; @Column(name = "CUSTOMER_CODE") @ApiParam(value = "客户代码") private String customerCode; 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 4686917..f48da84 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 @@ -29,6 +29,7 @@ import javax.persistence.Table; @Table(name="WMS_DOCK") @Api("道口预约信息") public class WmsDock extends BaseBean { + private static final long serialVersionUID = 1084849307899138229L; @Column(name="DOCK_CODE") @ApiParam("道口代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 f243e07..d8dd810 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 @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api("道口预约信息") public class WmsDockOrderInfo extends BaseBean { + private static final long serialVersionUID = -18500387985953214L; @Column(name="DOCK_CODE") @ApiParam("道口代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 acdd899..4ccaabf 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("道口窗口时间") public class WmsDockWindowTime extends BaseBean { + private static final long serialVersionUID = -3188113111546998811L; @Column(name="DOCK_CODE") @ApiParam("道口代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) 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 04ccb22..796f7eb 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 @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value = "物流费用管理", description = "物流费用管理") public class WmsLogisticsCosts extends BaseBean { + private static final long serialVersionUID = -5307311210847854654L; @Column(name = "ORGANIZE_NAME") @ApiParam(value = "工厂名称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 3cc9ebc..4816585 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 @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value = "运输方式", description = "运输方式") public class WmsModeTransport extends BaseBean { + private static final long serialVersionUID = 2323715097364547677L; @Column(name = "ORGANIZE_NAME") @ApiParam(value = "工厂名称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 d96f8c2..2747b2b 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("物料检测大类") public class WmsPartCheckType extends BaseBean { + private static final long serialVersionUID = -5189386821943180930L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) 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 75d3389..aa6cdcf 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 @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api("物料扩展属性表") public class WmsPartExtend extends BaseBean { + private static final long serialVersionUID = 353287580297379377L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; 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 fce1683..87bce24 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("物料子检测项") public class WmsPartItemCheck extends BaseBean { + private static final long serialVersionUID = 2889708862689686630L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) 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 1d29b77..1a083df 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="物料关系表",description = "物料关系表") public class WmsPartRelation extends BaseBean { + private static final long serialVersionUID = -3532040201124896970L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; 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 34ecff1..e7c329b 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("开口合同PO关系表") public class WmsProcurementPlanContract extends BaseBean { + private static final long serialVersionUID = 3966394697226562966L; @Column(name = "ORDER_NO") @ApiParam(value = "合同号") private String orderNo; 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 f6db3d7..e415a70 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -20,6 +19,7 @@ import java.io.Serializable; @Api(value="生产退料导入模板",description = "生产退料导入模板") public class WmsProductReturnMovement implements Serializable{ + private static final long serialVersionUID = -4099139082544312496L; @ApiParam(value = "单号") @AnnoOutputColumn private String orderNo; 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 3bded5f..34e1394 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "物流供应商关系", description = "库存物流供应商关系条码信息") public class WmsProviderFlag extends BaseBean { + private static final long serialVersionUID = -4732299479463118555L; @Column(name = "ORGANIZE_NAME") @ApiParam(value = "工厂名称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 52d22b3..ed602bf 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Table(name = "WMS_PULL_RULE") @Api("拉动规则") public class WmsPullRule extends BaseBean { + private static final long serialVersionUID = -4259512587710548316L; @Column(name = "PULL_WAY") @ApiParam(value = "拉动类型", example = "10") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS") 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 1f71f81..d58e019 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 @@ -25,13 +25,14 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name = "WMS_LOGISTICS_COSTS") +@Table(name = "WMS_SHORT_LOGISTICS_COSTS") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "物流费用管理", description = "物流费用管理") public class WmsShortLogisticsCosts extends BaseBean { + private static final long serialVersionUID = 733863151632950809L; @Column(name = "ORGANIZE_NAME") @ApiParam(value = "工厂名称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 094e240..0ef223b 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 @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api(value="条码操作记录表",description = "条码操作记录表") public class WmsSnOperateRecord extends BaseBean { + private static final long serialVersionUID = -8163029081131228416L; @Column(name = "SN") @ApiParam(value = "条码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) 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 515de40..bbd4bb2 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 @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api("库存初始化信息") public class WmsStockInitialize extends BaseBean { + private static final long serialVersionUID = -6653811290493674698L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") @AnnoOutputColumn(required = false) 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 1bab8d2..dfe3b86 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 @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api("替代料") public class WmsSubPart extends BaseBean { + private static final long serialVersionUID = -8864784324056827764L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 9e6d386..ffbfba7 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 @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api("驾驶员信息") public class WmsTmsDriver extends BaseBean { + private static final long serialVersionUID = 2083909056682628791L; @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 bf0c626..befe9e5 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 @@ -32,6 +32,7 @@ import java.util.List; @Api("装车单信息") public class WmsTmsShippingExt extends BaseBean { + private static final long serialVersionUID = -3261413137866351406L; @Column(name="MOVE_NO") @ApiParam(value ="移库单号") private String moveNo; 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 7b1e347..ee0536c 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="供应商计划员",description = "供应商计划员") public class WmsVendorPlanner extends BaseBean { + private static final long serialVersionUID = 6444925010696953067L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; 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 3b3bc84..fa72ef5 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="供应商父子关系",description = "供应商父子关系") public class WmsVendorRelation extends BaseBean { + private static final long serialVersionUID = 723387673958938803L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; 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 bc65739..4902c6a 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="供应商窗口时间",description = "供应商窗口时间") public class WmsVendorWindow extends BaseBean { + private static final long serialVersionUID = -8156667748890281030L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; 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 2e3cffa..48203e8 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 @@ -7,6 +7,7 @@ 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; @@ -26,6 +27,7 @@ import javax.persistence.Table; @Table(name = "WMS_INTERFACE_DATA_MAPPER") @Api("接口数据映射") public class WmsInterfaceDataMapper extends BaseBean { + private static final long serialVersionUID = 4139044040492108498L; /** * 排序编号 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java index 49d975d..3b0840c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java @@ -4,12 +4,12 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; -import javax.persistence.Transient; import java.io.Serializable; @Data public class WmsCarDto extends BaseDto implements Serializable { + private static final long serialVersionUID = 1477585131669086208L; @Column(name="CAR_NO") @ApiParam(value ="车牌号") private String carNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java index ad84be5..47c76ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java @@ -16,6 +16,7 @@ import java.io.Serializable; @Data public class WmsTmsDriverDto extends BaseDto implements Serializable { + private static final long serialVersionUID = 1686388995931944419L; @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") private String driverNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java index 04c9772..79878f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java @@ -18,6 +18,7 @@ import java.util.List; @Api("装车单批量入参") @Data public class WmsTmsShipBacthDto extends BaseDto implements Serializable { + private static final long serialVersionUID = -6901734563284429774L; @ApiParam("装车单集合") private List wmsTmsShipDtoList=new ArrayList<>(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index bdd8cc6..07661de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -17,6 +17,7 @@ import java.io.Serializable; @Data public class WmsTmsShipDto extends BaseDto implements Serializable { + private static final long serialVersionUID = -523839265877092396L; @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index 95d0191..249a42b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Table(name = "DROOLS_RULE_PERSISTENCE") @Api("系统动态业务规则") public class EngineRulePersistence extends BaseBean { + private static final long serialVersionUID = 5119552483383770556L; // 规则调用的唯一编号，例如：WMS_RECEIVE_0001 @Column(name = "RULE_NO", length = 50) private String ruleNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java index b41de8e..c7e9d7c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java @@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; -import javax.persistence.*; -import javax.script.CompiledScript; -import javax.script.ScriptContext; -import javax.script.ScriptEngine; -import javax.script.ScriptException; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; /** * 脚本持久化实体类 @@ -30,6 +29,7 @@ import javax.script.ScriptException; @Table(name = "SCRIPT_PERSISTENCE") @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java index edefeab..4615324 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("系统动态脚本") public class EngineScriptPersistenceHistory extends BaseBean { + private static final long serialVersionUID = 7201021903118622899L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java index bd413a9..30d2c3c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java @@ -18,6 +18,7 @@ import lombok.Data; @Api("供应商微服调用Model") public class WmsBasVendorModel extends BaseBean { + private static final long serialVersionUID = -4097250031510982530L; @ApiParam("供应商") private BasVendor basVendor; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 29d481e..f9d9951 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -18,6 +18,7 @@ import java.util.List; @Api("数据权限Model") public class WmsDataAuthModel extends BaseBean { + private static final long serialVersionUID = -1830754107669382563L; @ApiParam("角色编号") private String roleCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java index dd2b411..5fe1327 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -14,6 +14,7 @@ import lombok.Data; @Api("未完成订单模型") public class WmsMoveUnfinishedOrderModel extends BaseBean{ + private static final long serialVersionUID = 363976915707604557L; @ApiParam("物料编码") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java index f842855..f375dfb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.wms.bean.BasVendor; import cn.estsh.i3plus.pojo.wms.bean.WmsPart; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -19,6 +18,7 @@ import lombok.Data; @Api("供应商微服调用Model") public class WmsPartModel extends BaseBean { + private static final long serialVersionUID = -4435519990466605445L; @ApiParam("物料") private WmsPart wmsPart; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 536f46c..d5b5feb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -18,6 +18,7 @@ import java.time.LocalTime; @Api("供应商收货看板") public class WmsPoAsnRecvModel extends BaseBean implements Comparable { + private static final long serialVersionUID = 7985236317993813219L; @ApiParam("订单号") private String orderNo; @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java index 660d2a2..dfae656 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java @@ -18,7 +18,9 @@ import javax.persistence.Entity; @Entity @Api("静态盘点查询输出model") public class WmsStaticCsModel extends BaseBean { - public WmsStaticCsModel(String staticStr,String orderNo, String locateNo, String sn, double qty ) { + private static final long serialVersionUID = 9039981061448266666L; + + public WmsStaticCsModel(String staticStr, String orderNo, String locateNo, String sn, double qty) { this.orderNo = orderNo; this.locateNo = locateNo; this.sn = sn; From 4b09d9fa8dbdf9cd482e54f4e9a46f215c1ba3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 13 May 2020 19:27:24 +0800 Subject: [PATCH 116/134] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.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/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index a9011f4..f6030f5 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 @@ -115,9 +115,9 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "is_obvious") private Integer isObvious; - // @ApiParam(value = "允许盘入的库位") -// @Column(name = "ALLOW_LOCATES") -// private String allowLocates; + @ApiParam(value = "允许盘入的库位") + @Column(name = "ALLOW_LOCATES") + private String allowLocates; public Integer getIsInventoryVal() { return this.isInventory == null ? 0 : this.isInventory.intValue(); } From 7778ce1afdbc5741c16c96429fc9c392aa071dbf Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 13 May 2020 20:16:50 +0800 Subject: [PATCH 117/134] =?UTF-8?q?=E7=B1=BB=E5=BA=8F=E5=88=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java | 1 + .../cn/estsh/i3plus/pojo/model/mes/ImportErrorModel.java | 1 + .../cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java | 1 + .../estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java | 1 + .../cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java | 1 + .../estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java | 1 + .../i3plus/pojo/wms/bean/WmsProcurementPlanContract.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java | 1 + .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java | 1 + .../cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 1 + .../i3plus/pojo/wms/engine/rule/EngineRulePersistence.java | 1 + .../pojo/wms/engine/script/EngineScriptPersistence.java | 12 ++++++------ .../wms/engine/script/EngineScriptPersistenceHistory.java | 1 + .../estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java | 1 + .../cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java | 1 + .../pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java | 1 + .../cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java | 2 +- .../estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java | 1 + .../i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java | 1 + .../i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java | 1 + .../cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java | 4 +++- .../i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java | 1 + .../i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 1 + 47 files changed, 55 insertions(+), 10 deletions(-) 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 e0de0f3..f355ca3 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 @@ -21,6 +21,7 @@ import java.util.List; @Api("mes导入结果model") public class ExcelImportModel implements Serializable { + private static final long serialVersionUID = 3075276018074690913L; @ApiParam("结果") private boolean result; 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 85c63bd..c644a49 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 @@ -20,6 +20,7 @@ import java.io.Serializable; @Api("mes导入异常结果model") public class ImportErrorModel implements Serializable { + private static final long serialVersionUID = 1212013821950324792L; @ApiParam("错误的行号") private int rowNum; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java index 609e87b..a8eb1fd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java @@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; @Api("导入结果model") public class ExcelImportModel implements Serializable { + private static final long serialVersionUID = 1444427447244864339L; @ApiParam("结果") private boolean result; 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 5940720..e4212d3 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 @@ -7,6 +7,7 @@ import java.io.Serializable; @Data public class WmsCSOrderDetailsModel implements Serializable { + private static final long serialVersionUID = 1035157716685531017L; @ApiParam("工厂代码") public String organizeCode; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 1ae6931..8dc8eed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -19,6 +19,7 @@ import java.util.List; @Api("WMS列表菜单model") public class WmsListElementModel extends BaseBean { + private static final long serialVersionUID = -4040701771244617270L; @ApiParam(value = "功能菜单ID") private Long functionId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 185bfe5..8183d1b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -19,6 +19,7 @@ import java.util.List; @Api("WMS列表搜索model") public class WmsSearchElementModel extends BaseBean { + private static final long serialVersionUID = -5429148439603308698L; @ApiParam(value = "功能菜单ID") private Long functionId; 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 6be1fbb..6a4eee3 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("BH子检测项") public class WmsBhChildDetectionItem extends BaseBean { + private static final long serialVersionUID = -8005468634643773682L; @Column(name = "CHECK_TYPE") @ApiParam("检测大类") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") 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 205c3d5..88525bb 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 @@ -34,6 +34,7 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Api(value = "bom历史记录", description = "bom历史记录") public class WmsBomHistory extends BaseBean { + private static final long serialVersionUID = -2781401699752981565L; @Column(name = "PART_NO") @ApiParam(value = "父物料号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 f32d795..fa3d7d1 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 @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api("车辆信息") public class WmsCar extends BaseBean { + private static final long serialVersionUID = -905792638347428695L; @Column(name = "CAR_NO") @ApiParam(value = "车牌号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 90d32ae..95e581d 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 @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="客户窗口时间",description = "客户窗口时间") public class WmsCustWindow extends BaseBean { + private static final long serialVersionUID = -6544671103929721988L; @Column(name = "CUST_NO") @ApiParam(value = "客户编码") private String custNo; 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 711858f..a071ed1 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="客户物料发往地",description = "客户物料发往地") public class WmsCustomerPartShipping extends BaseBean { + private static final long serialVersionUID = 9091356911517332847L; @Column(name = "CUSTOMER_CODE") @ApiParam(value = "客户代码") private String customerCode; 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 4686917..f48da84 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 @@ -29,6 +29,7 @@ import javax.persistence.Table; @Table(name="WMS_DOCK") @Api("道口预约信息") public class WmsDock extends BaseBean { + private static final long serialVersionUID = 1084849307899138229L; @Column(name="DOCK_CODE") @ApiParam("道口代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 f243e07..d8dd810 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 @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api("道口预约信息") public class WmsDockOrderInfo extends BaseBean { + private static final long serialVersionUID = -18500387985953214L; @Column(name="DOCK_CODE") @ApiParam("道口代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 acdd899..4ccaabf 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("道口窗口时间") public class WmsDockWindowTime extends BaseBean { + private static final long serialVersionUID = -3188113111546998811L; @Column(name="DOCK_CODE") @ApiParam("道口代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) 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 d96f8c2..2747b2b 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("物料检测大类") public class WmsPartCheckType extends BaseBean { + private static final long serialVersionUID = -5189386821943180930L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) 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 75d3389..aa6cdcf 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 @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api("物料扩展属性表") public class WmsPartExtend extends BaseBean { + private static final long serialVersionUID = 353287580297379377L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; 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 a0ef402..35dfe84 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("物料子检测项") public class WmsPartItemCheck extends BaseBean { + private static final long serialVersionUID = 2889708862689686630L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) 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 1d29b77..1a083df 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="物料关系表",description = "物料关系表") public class WmsPartRelation extends BaseBean { + private static final long serialVersionUID = -3532040201124896970L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; 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 34ecff1..e7c329b 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("开口合同PO关系表") public class WmsProcurementPlanContract extends BaseBean { + private static final long serialVersionUID = 3966394697226562966L; @Column(name = "ORDER_NO") @ApiParam(value = "合同号") private String orderNo; 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 f6db3d7..e415a70 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -20,6 +19,7 @@ import java.io.Serializable; @Api(value="生产退料导入模板",description = "生产退料导入模板") public class WmsProductReturnMovement implements Serializable{ + private static final long serialVersionUID = -4099139082544312496L; @ApiParam(value = "单号") @AnnoOutputColumn private String orderNo; 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 52d22b3..ed602bf 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Table(name = "WMS_PULL_RULE") @Api("拉动规则") public class WmsPullRule extends BaseBean { + private static final long serialVersionUID = -4259512587710548316L; @Column(name = "PULL_WAY") @ApiParam(value = "拉动类型", example = "10") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS") 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 094e240..0ef223b 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 @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api(value="条码操作记录表",description = "条码操作记录表") public class WmsSnOperateRecord extends BaseBean { + private static final long serialVersionUID = -8163029081131228416L; @Column(name = "SN") @ApiParam(value = "条码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) 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 d2ea6db..b63ebca 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 @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api("库存初始化信息") public class WmsStockInitialize extends BaseBean { + private static final long serialVersionUID = -6653811290493674698L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") @AnnoOutputColumn(required = false) 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 1bab8d2..dfe3b86 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 @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api("替代料") public class WmsSubPart extends BaseBean { + private static final long serialVersionUID = -8864784324056827764L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 9e6d386..ffbfba7 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 @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api("驾驶员信息") public class WmsTmsDriver extends BaseBean { + private static final long serialVersionUID = 2083909056682628791L; @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) 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 bf0c626..befe9e5 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 @@ -32,6 +32,7 @@ import java.util.List; @Api("装车单信息") public class WmsTmsShippingExt extends BaseBean { + private static final long serialVersionUID = -3261413137866351406L; @Column(name="MOVE_NO") @ApiParam(value ="移库单号") private String moveNo; 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 7b1e347..ee0536c 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="供应商计划员",description = "供应商计划员") public class WmsVendorPlanner extends BaseBean { + private static final long serialVersionUID = 6444925010696953067L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; 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 3b3bc84..fa72ef5 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="供应商父子关系",description = "供应商父子关系") public class WmsVendorRelation extends BaseBean { + private static final long serialVersionUID = 723387673958938803L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; 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 bc65739..4902c6a 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="供应商窗口时间",description = "供应商窗口时间") public class WmsVendorWindow extends BaseBean { + private static final long serialVersionUID = -8156667748890281030L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; 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 2e3cffa..48203e8 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 @@ -7,6 +7,7 @@ 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; @@ -26,6 +27,7 @@ import javax.persistence.Table; @Table(name = "WMS_INTERFACE_DATA_MAPPER") @Api("接口数据映射") public class WmsInterfaceDataMapper extends BaseBean { + private static final long serialVersionUID = 4139044040492108498L; /** * 排序编号 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java index 49d975d..3b0840c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java @@ -4,12 +4,12 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; -import javax.persistence.Transient; import java.io.Serializable; @Data public class WmsCarDto extends BaseDto implements Serializable { + private static final long serialVersionUID = 1477585131669086208L; @Column(name="CAR_NO") @ApiParam(value ="车牌号") private String carNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java index ad84be5..47c76ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java @@ -16,6 +16,7 @@ import java.io.Serializable; @Data public class WmsTmsDriverDto extends BaseDto implements Serializable { + private static final long serialVersionUID = 1686388995931944419L; @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") private String driverNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java index 04c9772..79878f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java @@ -18,6 +18,7 @@ import java.util.List; @Api("装车单批量入参") @Data public class WmsTmsShipBacthDto extends BaseDto implements Serializable { + private static final long serialVersionUID = -6901734563284429774L; @ApiParam("装车单集合") private List wmsTmsShipDtoList=new ArrayList<>(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index bdd8cc6..07661de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -17,6 +17,7 @@ import java.io.Serializable; @Data public class WmsTmsShipDto extends BaseDto implements Serializable { + private static final long serialVersionUID = -523839265877092396L; @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index 95d0191..249a42b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Table(name = "DROOLS_RULE_PERSISTENCE") @Api("系统动态业务规则") public class EngineRulePersistence extends BaseBean { + private static final long serialVersionUID = 5119552483383770556L; // 规则调用的唯一编号，例如：WMS_RECEIVE_0001 @Column(name = "RULE_NO", length = 50) private String ruleNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java index b41de8e..c7e9d7c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java @@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; -import javax.persistence.*; -import javax.script.CompiledScript; -import javax.script.ScriptContext; -import javax.script.ScriptEngine; -import javax.script.ScriptException; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; /** * 脚本持久化实体类 @@ -30,6 +29,7 @@ import javax.script.ScriptException; @Table(name = "SCRIPT_PERSISTENCE") @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java index edefeab..4615324 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("系统动态脚本") public class EngineScriptPersistenceHistory extends BaseBean { + private static final long serialVersionUID = 7201021903118622899L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java index bd413a9..30d2c3c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java @@ -18,6 +18,7 @@ import lombok.Data; @Api("供应商微服调用Model") public class WmsBasVendorModel extends BaseBean { + private static final long serialVersionUID = -4097250031510982530L; @ApiParam("供应商") private BasVendor basVendor; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 29d481e..f9d9951 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -18,6 +18,7 @@ import java.util.List; @Api("数据权限Model") public class WmsDataAuthModel extends BaseBean { + private static final long serialVersionUID = -1830754107669382563L; @ApiParam("角色编号") private String roleCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java index dd2b411..5fe1327 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -14,6 +14,7 @@ import lombok.Data; @Api("未完成订单模型") public class WmsMoveUnfinishedOrderModel extends BaseBean{ + private static final long serialVersionUID = 363976915707604557L; @ApiParam("物料编码") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java index f842855..f375dfb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.wms.bean.BasVendor; import cn.estsh.i3plus.pojo.wms.bean.WmsPart; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -19,6 +18,7 @@ import lombok.Data; @Api("供应商微服调用Model") public class WmsPartModel extends BaseBean { + private static final long serialVersionUID = -4435519990466605445L; @ApiParam("物料") private WmsPart wmsPart; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 536f46c..d5b5feb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -18,6 +18,7 @@ import java.time.LocalTime; @Api("供应商收货看板") public class WmsPoAsnRecvModel extends BaseBean implements Comparable { + private static final long serialVersionUID = 7985236317993813219L; @ApiParam("订单号") private String orderNo; @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java index 2b2fed2..62e107f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java @@ -18,6 +18,7 @@ import javax.persistence.Entity; @Entity @Api("报工事务明细表model") public class WmsReportTransDetailModel extends BaseBean { + private static final long serialVersionUID = 1547988564672291041L; @ApiParam(value = "报工产线") private String lineNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java index b4a467c..fb58af7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java @@ -18,6 +18,7 @@ import javax.persistence.Entity; @Entity @Api("报工事务汇总表model") public class WmsReportTransMasterModel extends BaseBean { + private static final long serialVersionUID = 5696795930973637987L; @ApiParam(value = "实体线") private String lineNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java index 660d2a2..dfae656 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java @@ -18,7 +18,9 @@ import javax.persistence.Entity; @Entity @Api("静态盘点查询输出model") public class WmsStaticCsModel extends BaseBean { - public WmsStaticCsModel(String staticStr,String orderNo, String locateNo, String sn, double qty ) { + private static final long serialVersionUID = 9039981061448266666L; + + public WmsStaticCsModel(String staticStr, String orderNo, String locateNo, String sn, double qty) { this.orderNo = orderNo; this.locateNo = locateNo; this.sn = sn; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java index 915567e..8757863 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java @@ -19,6 +19,7 @@ import javax.persistence.Entity; @Api("供应商延迟到货明细表model") public class WmsVendorDelayDetailModel extends BaseBean { + private static final long serialVersionUID = -1030326082916174340L; @ApiParam(value = "单据编号") private String orderNo; 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 3166ac2..4b6314c 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 @@ -19,6 +19,7 @@ import javax.persistence.Entity; @Api("供应商延迟到货汇总表model") public class WmsVendorDelayMasterModel extends BaseBean { + private static final long serialVersionUID = 1589775350017343999L; @ApiParam(value = "供应商代码") private String vendorNo; From e74f3d6d99e34df7822a8f7b3a9c73dff5c0bbf2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 14 May 2020 09:00:51 +0800 Subject: [PATCH 118/134] =?UTF-8?q?BUG#8438=E3=80=9020011--=20=E5=85=AD?= =?UTF-8?q?=E5=90=88=E4=B8=80=E6=94=B9=E6=95=B0=E6=8C=89=E9=92=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=8C=E6=89=93=E5=BC=80=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=8E=E6=95=B0=E9=87=8F=E4=BC=9A=E7=B4=AF?= =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E4=B8=8B=E6=96=B9=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=AE=A9=E7=94=A8=E6=88=B7=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E9=87=8F--0515=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/WmsDataAuth.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/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index 348bb18..1995c1c 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -41,7 +42,8 @@ public class WmsDataAuth extends BaseBean { return String.valueOf(dataObj); } - @Column(name = "DATA_OBJ_VALUE") + @Lob + @Column(name = "DATA_OBJ_VALUE", columnDefinition = "TEXT") @ApiParam(value = "数据对象值") private String dataObjValue; From 953248950289635ec00ce1add8f34beab5971904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 14 May 2020 09:27:49 +0800 Subject: [PATCH 119/134] =?UTF-8?q?POJO=E6=B7=BB=E5=8A=A0=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8C=96id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 ++ .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 ++ .../java/cn/estsh/i3plus/pojo/form/bean/BfButton.java | 1 + .../java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java | 1 + .../estsh/i3plus/pojo/form/bean/BfCascadeDetail.java | 1 + .../cn/estsh/i3plus/pojo/form/bean/BfDataObject.java | 1 + .../i3plus/pojo/form/bean/BfDataObjectProperty.java | 1 + .../cn/estsh/i3plus/pojo/form/bean/BfDataSource.java | 1 + .../java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 1 + .../i3plus/pojo/form/bean/BfElementConstraint.java | 1 + .../cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java | 1 + .../estsh/i3plus/pojo/form/bean/BfElementProperty.java | 1 + .../pojo/form/bean/BfElementPropertyVirtual.java | 1 + .../cn/estsh/i3plus/pojo/form/bean/BfElementTree.java | 1 + .../cn/estsh/i3plus/pojo/form/bean/BfIntercept.java | 3 +-- .../estsh/i3plus/pojo/form/bean/BfInterceptDetail.java | 1 + .../java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java | 2 +- .../cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java | 1 + .../cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java | 2 +- .../java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java | 1 + .../java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java | 1 + .../cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java | 1 + .../i3plus/pojo/form/bean/BfMethodDetailProperty.java | 1 + .../estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java | 1 + .../form/bean/BfRefElementPropertyVirtualDetail.java | 1 + .../estsh/i3plus/pojo/form/bean/BfRefMethodRole.java | 1 + .../estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java | 4 +++- .../cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java | 4 +++- .../cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java | 9 ++++++--- .../estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java | 5 ++++- .../i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java | 5 ++++- .../i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java | 5 ++++- .../estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java | 4 +++- .../estsh/i3plus/pojo/lac/bean/LacCommandOperate.java | 18 +++++++++++------- .../i3plus/pojo/lac/bean/LacCommandStackStep.java | 1 + .../i3plus/pojo/lac/bean/LacCommandStackStepTask.java | 1 + .../i3plus/pojo/lac/bean/LacCommandStackTemplate.java | 1 + .../i3plus/pojo/lac/bean/LacCommandStackType.java | 17 +++++++++-------- .../cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java | 9 +++++---- .../cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 1 + .../estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java | 1 + .../i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java | 1 + .../cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java | 1 + .../cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java | 1 + .../cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 7 +++++-- .../i3plus/pojo/platform/platbean/SysLogConsole.java | 5 ++--- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 13 +++++++++++++ .../i3plus/pojo/softswitch/bean/BsDataSource.java | 1 + .../i3plus/pojo/softswitch/bean/BsMessageQueue.java | 1 + .../i3plus/pojo/softswitch/bean/BsParamAdapter.java | 1 + .../i3plus/pojo/softswitch/bean/BsSocketSuitCase.java | 4 ++-- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java | 1 + .../i3plus/pojo/softswitch/bean/BsSslKeyParam.java | 1 + .../estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java | 1 + .../pojo/softswitch/bean/BsSuitCaseDataSource.java | 1 + .../softswitch/bean/BsSuitCaseDataSourceTable.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitCaseMq.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 1 + .../pojo/softswitch/bean/BsSuitCaseWebService.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitDataDetail.java | 1 + .../estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitRecordParam.java | 1 + .../pojo/softswitch/bean/BsSuitRequestRecord.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitSchedule.java | 1 + .../estsh/i3plus/pojo/softswitch/bean/BsSuitType.java | 1 + .../i3plus/pojo/softswitch/bean/TestDataBase.java | 1 + 70 files changed, 135 insertions(+), 40 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index e85f93d..428a4f4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -31,6 +31,8 @@ import java.io.Serializable; //@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public abstract class BaseBean implements Serializable { + private static final long serialVersionUID = 1L; + //此处使用hibernate的主键策略方式 //手动设置,使用iplus-platform-common中的idtool生成 //将Long类型系列化成String避免精度丢失 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 01ad320..302a912 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 @@ -39,6 +39,8 @@ public class CommonEnumUtil { LAC(26, 8600, 13, "lac", "连接适配器"), ANDON(27, 8500, 14, "andon", "安灯"), APS(28, 8400, 15, "i3aps", "高级计划与排产"), + + MDM(29, 8150, 22, "i3mdm", "数据中心MDM"), CENTER(99, 8000, 1, "icloud-server", "注册中心"), SURFACE(98, 0, 0, "i3surface", "对外服务"), CLOUD(97, 0, 0, "i3cloud", "微服务"), diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index f350e27..11a0bcf 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "表单按钮", description = "表单按钮") public class BfButton extends BaseBean { + private static final long serialVersionUID = -1675967061983417558L; @Column(name = "BUTTON_NAME") @ApiParam(value = "按钮名称") private String buttonName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java index 44bd93e..14be338 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java @@ -33,6 +33,7 @@ import java.util.List; @Api(value="级联元素",description = "级联元素") public class BfCascade extends BaseBean { + private static final long serialVersionUID = -2114224803602089395L; @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java index ffbebed..368da78 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="级联元素明细",description = "级联元素") public class BfCascadeDetail extends BaseBean { + private static final long serialVersionUID = -8365699249398175846L; @Column(name = "CASCADE_ID") @ApiParam(value = "级联ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index b673a6a..5d5f78a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -30,6 +30,7 @@ import java.util.List; @Api(value="数据对象",description = "原数据对象，最原始数据") public class BfDataObject extends BaseBean { + private static final long serialVersionUID = -6450328805517462673L; @Column(name = "DATA_SOURCE_ID") @ApiParam(value = "数据源ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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 c5d2d9a..c12f8d0 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 @@ -33,6 +33,7 @@ import java.util.List; @Api(value = "数据对象属性表", description = "数据对象的属性明细表") public class BfDataObjectProperty extends BaseBean { + private static final long serialVersionUID = 2607149135728621568L; //外键关联数据对象主键 @Column(name = "DATA_OBJECT_ID") @ApiParam(value = "数据对象ID", example = "-1") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java index 9d00452..cfce1b5 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java @@ -29,6 +29,7 @@ import java.util.List; @Api(value="数据对象",description = "原数据对象，最原始数据") public class BfDataSource extends BaseBean { + private static final long serialVersionUID = -749606489129498769L; @Column(name="SOURCE_NAME") @ApiParam(value ="数据源名称") private String sourceName; 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 549d365..29d0044 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 @@ -33,6 +33,7 @@ import java.util.List; @Api(value = "对象元素基础", description = "元素基础表") public class BfElement extends BaseBean { + private static final long serialVersionUID = -3309080566388373068L; //外键关联数据对象主键 @Column(name = "ELEMENT_INFO_ID") @ApiParam(value = "对象元素明细ID", example = "-1") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java index 7a6ee13..e226eaf 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api(value = "元素约束", description = "元素约束") public class BfElementConstraint extends BaseBean { + private static final long serialVersionUID = 6951083749548881908L; @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index 9656d18..a3675cd 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value = "对象元素表格", description = "对象元素表格") public class BfElementGrid extends BaseBean { + private static final long serialVersionUID = -3730288075103132153L; //外键关联数据对象主键 @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") 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 569c3ed..8cc9ca2 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 @@ -32,6 +32,7 @@ import javax.persistence.Transient; @Api(value="对象元素属性",description = "对象元素属性 相当于数据对象属性的扩展") public class BfElementProperty extends BaseBean { + private static final long serialVersionUID = 8391877375302721425L; @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 688db18..26ca40e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -30,6 +30,7 @@ import java.util.List; @Api(value="对象元素虚拟属性",description = "对象元素虚拟属性") public class BfElementPropertyVirtual extends BaseBean { + private static final long serialVersionUID = -8746243539245788738L; @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java index ef4c996..9fae58a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api(value = "对象元素基础", description = "元素基础表") public class BfElementTree extends BaseBean { + private static final long serialVersionUID = -6173269177770192337L; //外键关联数据对象主键 @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java index 5e67b40..e336296 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.form.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; @@ -30,6 +28,7 @@ import javax.persistence.Table; @Api(value="拦截器主体") public class BfIntercept extends BaseBean { + private static final long serialVersionUID = -7880837699871138830L; @Column(name="INTERCEPT_NAME") @ApiParam(value ="拦截器名称") private String interceptName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java index c4a9495..a0cf303 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api(value="拦截器明细") public class BfInterceptDetail extends BaseBean { + private static final long serialVersionUID = -2813973524088674573L; @Column(name="INTERCEPT_ID") @ApiParam(value ="拦截器id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java index d58c49c..a56d039 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.List; @@ -28,6 +27,7 @@ import java.util.List; @Api(value = "自定义表单布局") public class BfLayout extends BaseBean { + private static final long serialVersionUID = 4951428858633293563L; @Column(name = "LAYOUT_NAME") @ApiParam(value = "名称") private String layoutName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java index bafc0a5..6c4abed 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "自定义表单布局-列") public class BfLayoutColumn extends BaseBean { + private static final long serialVersionUID = -8711414349182712011L; @Column(name = "LAYOUT_ID") @ApiParam(value = "布局主键") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java index c9888f1..d96cc02 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.List; @@ -30,6 +29,7 @@ import java.util.List; @Api(value = "自定义表单布局-行") public class BfLayoutRow extends BaseBean { + private static final long serialVersionUID = -3327441937912038000L; @Column(name = "LAYOUT_ID") @ApiParam(value = "布局主键") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index 2275dd3..f12fc60 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="表单菜单目录",description = "表单菜单目录") public class BfMenu extends BaseBean { + private static final long serialVersionUID = 6559248298739431579L; @Column(name="MENU_NAME") @ApiParam(value ="菜单名称") private String menuName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java index 31953ee..661cf28 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="表单功能",description = "表单功能") public class BfMethod extends BaseBean { + private static final long serialVersionUID = 6976569600026342045L; @Column(name="METHOD_NAME") @ApiParam(value ="功能名称") private String methodName; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java index dec8a80..7adc527 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="表单功能明细",description = "表单功能明细") public class BfMethodDetail extends BaseBean { + private static final long serialVersionUID = 3982619673130000003L; @Column(name="METHOD_ID") @ApiParam(value ="功能id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index 373f34e..9f2b83c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") public class BfMethodDetailProperty extends BaseBean { + private static final long serialVersionUID = -7541677357317732343L; @Column(name="METHOD_ID") @ApiParam(value ="功能id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java index 0ca9523..2dda683 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api(value="按钮功能关系",description = "按钮功能关系") public class BfRefButtonMethod extends BaseBean { + private static final long serialVersionUID = 1145541515189800147L; @Column(name="BUTTON_ID") @ApiParam(value ="按钮id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java index 4837677..a59f430 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="对象元素虚拟属性",description = "对象元素虚拟属性") public class BfRefElementPropertyVirtualDetail extends BaseBean { + private static final long serialVersionUID = 3315763374468711786L; @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java index 42eff42..7f6a4b5 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "功能角色关系", description = "功能角色关系") public class BfRefMethodRole extends BaseBean { + private static final long serialVersionUID = 8134565165534099843L; @Column(name = "METHOD_ID") @ApiParam(value = "表单功能id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java index 8921aea..e4aa123 100644 --- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.ics.bean; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; import java.util.List; /** @@ -13,8 +14,9 @@ import java.util.List; * @Modify: **/ @Data -public class IcsActuatorMetrics { +public class IcsActuatorMetrics implements Serializable { + private static final long serialVersionUID = 4341201186821752353L; private String name; private List measurements; private List availableTags; diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java index d391222..5575103 100644 --- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -16,8 +17,9 @@ import java.util.List; **/ @Data @ApiModel("应用信息") -public class IcsApplication { +public class IcsApplication implements Serializable { + private static final long serialVersionUID = -1923997516217683087L; @ApiModelProperty("应用名称") private String appName; diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java index 086ce01..df2d460 100644 --- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -14,8 +16,9 @@ import lombok.Data; **/ @Data @ApiModel("实例信息") -public class IcsInstance { +public class IcsInstance implements Serializable { + private static final long serialVersionUID = 2648298051066693374L; @ApiModelProperty("实例id") private String instanceId; @@ -31,7 +34,7 @@ public class IcsInstance { @ApiModelProperty("状态时间") private String statusTimeStampStr; - public String getInstanceStatusTxt(){ - return instanceStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus); + public String getInstanceStatusTxt() { + return instanceStatus == null ? "无" : CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus); } } diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java index b36168a..f632be5 100644 --- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @Description : 实例明细 * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @ApiModel("实例明细") -public class IcsInstanceDetail { +public class IcsInstanceDetail implements Serializable { + private static final long serialVersionUID = -348649782622051827L; @ApiModelProperty("pid") private String pid; diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java index 63b0003..ded6dcc 100644 --- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @Description : 实例堆内存 * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @ApiModel("实例堆内存") -public class IcsInstanceMemoryHeap { +public class IcsInstanceMemoryHeap implements Serializable { + private static final long serialVersionUID = -5982536759101768884L; @ApiModelProperty("堆使用的内存") private double heapMemoryUsed; diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java index 15a655c..e767813 100644 --- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @Description :实例堆非内存 * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @ApiModel("实例堆非内存") -public class IcsInstanceMemoryNonHeap { +public class IcsInstanceMemoryNonHeap implements Serializable { + private static final long serialVersionUID = 5457399972284816473L; @ApiModelProperty("非堆内存元空间") private double nonHeapMemoryMetaspace; diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java index 287aab5..d702cfa 100644 --- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @Description : 实例线程信息 * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @ApiModel("实例线程信息") -public class IcsInstanceThread { +public class IcsInstanceThread implements Serializable { + private static final long serialVersionUID = -272358532317411617L; @ApiModelProperty("实时线程") private double threadLive; diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java index ec4f028..4bc3bd5 100644 --- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -15,8 +16,9 @@ import java.util.List; **/ @Data @ApiModel("注册中心") -public class IcsRegist { +public class IcsRegist implements Serializable { + private static final long serialVersionUID = -5624347440991960286L; @ApiModelProperty("环境") private String environment; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java index 178579f..dbae345 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -15,25 +17,27 @@ import lombok.Data; **/ @Data @ApiModel("指令操作") -public class LacCommandOperate { +public class LacCommandOperate implements Serializable { - @ApiParam(value ="指令集记录id" , example = "-1") + private static final long serialVersionUID = 2877359322522442241L; + @ApiParam(value = "指令集记录id", example = "-1") private Long operateObjId; - @ApiParam(value ="操作对象类型" , example = "-1") + @ApiParam(value = "操作对象类型", example = "-1") @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_OBJ_TYPE.class) private Integer operateObjType; - @ApiParam(value ="操作" , example = "-1") + @ApiParam(value = "操作", example = "-1") @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class) private Integer operateCommand; - public LacCommandOperate(){} + public LacCommandOperate() { + } - public LacCommandOperate(Long operateObjId,Integer operate){ + public LacCommandOperate(Long operateObjId, Integer operate) { this.operateObjId = operateObjId; LacEnumUtil.OPERATE_COMMAND operate_command = LacEnumUtil.OPERATE_COMMAND.valueOf(operate); - if(operate_command!=null) { + if (operate_command != null) { this.operateCommand = operate_command.getValue(); this.operateObjType = operate_command.getOperateObjType().getValue(); } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index 1caf947..1fa346d 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -52,6 +52,7 @@ import java.util.List; @Api(value="指令集步骤",description = "指令集步骤") public class LacCommandStackStep extends BaseBean { + private static final long serialVersionUID = 4053765920069631323L; @Column(name="TEMPLATE_ID") @ApiParam(value ="模板ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index 63154b6..68619ff 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -55,6 +55,7 @@ import javax.persistence.Transient; @Api(value="步骤任务",description = "步骤任务信息") public class LacCommandStackStepTask extends BaseBean { + private static final long serialVersionUID = 7432247591995852126L; @Column(name="TEMPLATE_ID") @ApiParam(value ="模板ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java index 7f301fa..09a9a04 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java @@ -49,6 +49,7 @@ import java.util.List; @Api(value="指令集模板",description = "指令集模板信息") public class LacCommandStackTemplate extends BaseBean { + private static final long serialVersionUID = 4884527553767334910L; @Column(name="TEMPLATE_NAME") @ApiParam(value ="模板名称") private String templateName; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java index c08c908..6978fdf 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java @@ -24,21 +24,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="LAC_COMMAND_STACK_TYPE") -@Api(value="指令集类型",description = "指令集类型") +@Table(name = "LAC_COMMAND_STACK_TYPE") +@Api(value = "指令集类型", description = "指令集类型") public class LacCommandStackType extends BaseBean { - @Column(name="TYPE_NAME") - @ApiParam(value ="类型名称") + private static final long serialVersionUID = -2699452452325728351L; + @Column(name = "TYPE_NAME") + @ApiParam(value = "类型名称") private String typeName; - @Column(name="TYPE_REF_NUM") - @ApiParam(value ="适配器使用数量") + @Column(name = "TYPE_REF_NUM") + @ApiParam(value = "适配器使用数量") private Integer typeRefNum; - @Column(name="TYPE_DESCRIPTION") - @ApiParam(value ="类型描述") + @Column(name = "TYPE_DESCRIPTION") + @ApiParam(value = "类型描述") private String typeDescription; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java index 9caa3b2..22fde54 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -57,17 +57,18 @@ import javax.persistence.Table; @Api(value="适配器",description = "适配器信息") public class LacSuitCase extends BaseBean { - @Column(name="SUTI_CASE_NAME_RDD") + private static final long serialVersionUID = 6325924633917664579L; + @Column(name="SUIT_CASE_NAME_RDD") @ApiParam(value ="适配器名称") - private String sutiCaseNameRdd; + private String suitCaseNameRdd; @Column(name="SUIT_CASE_CODE_RDD") @ApiParam(value ="适配器代码") private String suitCaseCodeRdd; - @Column(name="SUTI_TYPE") + @Column(name="SUIT_TYPE") @ApiParam(value ="适配器类型") - private Integer sutiType; + private Integer suitType; @Column(name="HARDWARE_TYPE") @ApiParam(value ="硬件类型") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 1c73450..33dfa08 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -61,6 +61,7 @@ import java.util.List; @Api(value="调度任务",description = "调度任务信息") public class LacSuitTask extends BaseBean { + private static final long serialVersionUID = -6592851798133225109L; @Column(name="TASK_NAME") @ApiParam(value ="适配器名称") private String taskName; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index 76e34fa..b281b0d 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -54,6 +54,7 @@ import javax.persistence.Transient; @Api(value="调度任务参数",description = "调度任务参数信息") public class LacSuitTaskParam extends BaseBean { + private static final long serialVersionUID = 3521650869017242460L; @Column(name="TASK_ID") @ApiParam(value ="任务ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java index 3ed31a6..05d07be 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java @@ -55,6 +55,7 @@ import javax.persistence.Table; @Api(value="调度任务参数转换",description = "调度任务参数转换信息") public class LacSuitTaskParamAdapter extends BaseBean { + private static final long serialVersionUID = -4049358225863293288L; @Column(name="TASK_ID") @ApiParam(value ="任务ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java index dd50d24..23f0b4d 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java @@ -33,6 +33,7 @@ import javax.persistence.Transient; @Api(value="任务检查",description = "任务检查") public class LacTaskCheck extends BaseBean { + private static final long serialVersionUID = -4157772560831884634L; @Column(name="COMMAND_STACK_TEMPLATE_ID") @ApiParam(value ="指令集模板ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java index 32a5f3c..32df0a3 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="任务类型",description = "任务类型") public class LacTaskType extends BaseBean { + private static final long serialVersionUID = 7596608775083338503L; @Column(name="TYPE_NAME") @ApiParam(value ="类型名称") private String typeName; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index a315c8c..ebfa83f 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -65,6 +65,7 @@ public class LacHqlPack { DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", ddlPackBean); return ddlPackBean; } @@ -165,6 +166,8 @@ public class LacHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackId(), "commandStackId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getCommandStackNameRdd(), "commandStackNameRdd", ddlPackBean); DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true); @@ -199,9 +202,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); - DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSuitType(),"suitType",ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index fd31e35..785c3dd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -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; @@ -49,9 +48,9 @@ public class SysLogConsole extends BaseBean { @ApiParam(value ="应用端口") private Integer logPort; - @Column(name="LOG_GORP") + @Column(name="LOG_GROUP") @ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)") - private String logGorp; + private String logGroup; @Column(name="LOG_LEVEL") @ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)") 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 8e68d4d..14fd254 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 @@ -67,6 +67,19 @@ public class CoreHqlPack { return ddlPackBean; } + /** + * In 参数封装 + * @param columnName + * @return + */ + public static DdlPackBean packHqlIn(String columnName, List params){ + DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean); + DdlPreparedPack.getInPack(params, columnName, ddlPackBean); + return ddlPackBean; + } + /** * 资源查询 diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index 5881a9c..2f04bc8 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api(value = "数据源管理", description = "数据源管理") public class BsDataSource extends BaseBean { + private static final long serialVersionUID = 2763423692635373368L; @Column(name = "DATA_SOURCE_NAME") @ApiParam(value = "数据源名称") private String dataSourceName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java index 5dbad2d..9b3baec 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "MQ管理", description = "MQ管理") public class BsMessageQueue extends BaseBean { + private static final long serialVersionUID = -1130706382023544729L; @Column(name = "MESSAGE_QUEUE_NAME") @ApiParam(value = "消息队列名称") private String messageQueueName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java index f449535..b0c8a8a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "数据适配转换", description = "数据适配转换") public class BsParamAdapter extends BaseBean { + private static final long serialVersionUID = -6238745304002006776L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java index 5b9e496..a796248 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java @@ -7,11 +7,10 @@ import lombok.Data; 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.util.List; /** * @Description : socket套件 @@ -29,6 +28,7 @@ import java.util.List; @Api(value = "socket套件", description = "socket套件") public class BsSocketSuitCase extends BaseBean { + private static final long serialVersionUID = -1491505137380808987L; @Column(name = "SOCKET_TYPE_ID") @ApiParam(value = "socket类型（枚举）") private Integer socketTypeId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java index dfab548..6ddffe1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java @@ -31,6 +31,7 @@ import java.util.List; @Api(value = "适配认证", description = "适配认证") public class BsSslKey extends BaseBean { + private static final long serialVersionUID = 3934205467948800784L; @Column(name = "KEY_NAME") @ApiParam(value = "证书名称") private String keyName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java index a4c52be..65a2a2b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @XStreamAlias("BsSslKeyParam") public class BsSslKeyParam extends BaseBean { + private static final long serialVersionUID = 3521715129533450992L; @Column(name = "SSL_KEY_ID") @ApiParam(value = "证书id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index deb2151..b06be17 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -33,6 +33,7 @@ import java.util.List; @Api(value = "适配套件", description = "适配套件") public class BsSuitCase extends BaseBean { + private static final long serialVersionUID = -281224716754866835L; @Column(name = "SUIT_CASE_NAME") @ApiParam(value = "套件名称") private String suitCaseName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java index a4631b7..dc3e426 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java @@ -31,6 +31,7 @@ import java.util.List; @Api(value = "数据库套件", description = "数据库套件") public class BsSuitCaseDataSource extends BaseBean { + private static final long serialVersionUID = 5519482989293937465L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java index 838514a..decd680 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "数据库表操作", description = "数据库表操作") public class BsSuitCaseDataSourceTable extends BaseBean { + private static final long serialVersionUID = 3674958775373712985L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) 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 db6e129..ab14d8d 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 @@ -32,6 +32,7 @@ import java.util.List; @Api(value = "FTP适配器", description = "FTP适配器") public class BsSuitCaseFTP extends BaseBean { + private static final long serialVersionUID = 6174265510888236886L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java index 3d3452b..07007ca 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "MQ", description = "MQ 适配套件") public class BsSuitCaseMq extends BaseBean { + private static final long serialVersionUID = 4562973480210332977L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 7a8856c..e6e5251 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -38,6 +38,7 @@ import java.util.List; @Api(value = "适配器出入参", description = "适配器出入参") public class BsSuitCaseParam extends BaseBean { + private static final long serialVersionUID = -2186546861255097857L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index 051d0c9..5fcea3e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -34,6 +34,7 @@ import java.util.List; @Api(value = "适配器出入参", description = "适配器出入参") public class BsSuitCaseREST extends BaseBean { + private static final long serialVersionUID = 3871469059124604719L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java index c5e2ef6..37a8e11 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "WebService", description = "WebService 适配套件") public class BsSuitCaseWebService extends BaseBean { + private static final long serialVersionUID = -5473608817496699798L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index e01af7b..cde8a74 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -34,6 +34,7 @@ import java.util.List; @Api(value = "适配报文详情", description = "适配报文详情") public class BsSuitDataDetail extends BaseBean { + private static final long serialVersionUID = 4086839854444963656L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配套件id") private String suitCaseId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index 21f5df5..7e2b460 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value = "适配文件信息", description = "适配文件信息") public class BsSuitFile extends BaseBean { + private static final long serialVersionUID = -5476684791619434327L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index bc9e7b0..6a46fc7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -36,6 +36,7 @@ import java.util.List; @Api(value = "适配记录", description = "适配记录") public class BsSuitRecord extends BaseBean { + private static final long serialVersionUID = 174969165955420968L; @Column(name = "SUIT_CASE_NAME_RDD") @ApiParam(value = "适配套件名称") private String suitCaseNameRdd; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index c1d94dc..e255175 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -28,6 +28,7 @@ import javax.persistence.*; @Api(value = "适配记录参数", description = "适配记录参数") public class BsSuitRecordParam extends BaseBean { + private static final long serialVersionUID = -5521394058203638651L; @Column(name = "SUIT_RECORD_ID") @ApiParam(value = "适配记录id") private Long suitRecordId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index e89b27e..81ae451 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -30,6 +30,7 @@ import javax.persistence.*; @Api(value = "请求适配记录", description = "请求适配记录") public class BsSuitRequestRecord extends BaseBean { + private static final long serialVersionUID = -6724051278362565068L; @Column(name = "SUIT_RECORD_ID") @ApiParam(value = "适配记录id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java index fc7c6fc..7d201ab 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "定时适配任务", description = "定时适配任务") public class BsSuitSchedule extends BaseBean { + private static final long serialVersionUID = 4814615639892051613L; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配套件id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java index 1499369..5ef077f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api(value = "适配类型", description = "适配类型") public class BsSuitType extends BaseBean { + private static final long serialVersionUID = 5149466646176647559L; @Column(name = "SUIT_TYPE_NAME") @ApiParam(value = "适配类型") private String suitTypeName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java index eaa600d..a8627b1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="测试数据 DataBase",description = "数据库操作测试") public class TestDataBase extends BaseBean { + private static final long serialVersionUID = -5334113633173923482L; @Column(name="NAME") @ApiParam(value ="名称" ) private String name; From 7f2c372229333868e171566507eaf445b5c24315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 14 May 2020 09:28:31 +0800 Subject: [PATCH 120/134] MDM POJO --- modules/i3plus-pojo-mdm/pom.xml | 22 +++++++++++ .../i3plus/pojo/mdm/bean/base/BaseMdmBean.java | 46 ++++++++++++++++++++++ .../i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java | 30 ++++++++++++++ .../pojo/mdm/bean/busi/core/MdmGearCoreExtd.java | 31 +++++++++++++++ .../estsh/i3plus/pojo/mdm/bean/master/MdmGear.java | 27 +++++++++++++ .../pojo/mdm/bean/model/core/MdmGearCoreModel.java | 19 +++++++++ pom.xml | 1 + 7 files changed, 176 insertions(+) create mode 100644 modules/i3plus-pojo-mdm/pom.xml create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml new file mode 100644 index 0000000..7f94617 --- /dev/null +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -0,0 +1,22 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-mdm + + + + i3plus.pojo + i3plus-pojo-base + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java new file mode 100644 index 0000000..f220dc7 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.persistence.Transient; + +/** + * @Description : MDM基础bean + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 17:30 + * @Modify: + **/ +@Data +@ApiModel("MDM基础bean") +public class BaseMdmBean extends BaseBean { + + private static final long serialVersionUID = 3957595289035947441L; + + @Transient + @ApiModelProperty("是否主数据") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + + @ApiModelProperty("mdm数据版本") + private Long mdmVersion; + + public long getMdmVersion() { + return mdmVersion == null ? 0 : mdmVersion; + } + + // 版本递增 + public long nextMdmVersion() { + return mdmVersion = getMdmVersion() + 1; + } + + @ApiModelProperty("是否发布") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isPublished; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java new file mode 100644 index 0000000..957a91e --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.persistence.Transient; + +/** + * @Description : MDM业务基础bean + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 17:30 + * @Modify: + **/ +@Data +@ApiModel("MDM业务基础bean") +public class BaseMdmExtdBean extends BaseMdmBean { + + private static final long serialVersionUID = 4267453020130810967L; + + @Transient + @ApiModelProperty("软件模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Integer mdmSoftType; + + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java new file mode 100644 index 0000000..bbe8b58 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi.core; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmExtdBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 主数据齿轮-平台扩展 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +@Data +@ApiModel("主数据齿轮-平台扩展") +public class MdmGearCoreExtd extends BaseMdmExtdBean { + + private static final long serialVersionUID = -3535174942277452194L; + + // 初始化数据 + static { + isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue(); + } + + @ApiModelProperty("核心数量") + public String coreNum; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java new file mode 100644 index 0000000..e20fec9 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mdm.bean.master; + +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 主数据齿轮 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +@Data +@ApiModel("主数据齿轮") +public class MdmGear extends BaseMdmBean { + + private static final long serialVersionUID = -7580444601811207793L; + + @ApiModelProperty("齿轮名称") + private String name; + + @ApiModelProperty("齿轮规格") + private String gearModel; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java new file mode 100644 index 0000000..46fd862 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mdm.bean.model.core; + +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreExtd; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; + +/** + * @Description : 主数据齿轮-平台model + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +public class MdmGearCoreModel { + + private MdmGear mdmGear; + + private MdmGearCoreExtd mdmGearCoreExtd; + +} diff --git a/pom.xml b/pom.xml index 1bef72c..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,7 @@ modules/i3plus-pojo-lac modules/i3plus-pojo-ptl modules/i3plus-pojo-ics + modules/i3plus-pojo-mdm From 99b5048ef00a36759ba4aa14451ee5561bfa1637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 14 May 2020 09:36:55 +0800 Subject: [PATCH 121/134] =?UTF-8?q?POJO=E6=B7=BB=E5=8A=A0=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8C=96id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/common/CloudPagerModel.java | 5 ++++- .../pojo/model/dynamic/table/DynTableCell.java | 8 +++---- .../pojo/model/dynamic/table/DynTableRow.java | 17 ++++++++------ .../pojo/model/dynamic/table/ImppDynTable.java | 11 +++++---- .../pojo/model/form/BfButtonOperateDataModel.java | 6 +++-- .../i3plus/pojo/model/form/CloudFormModel.java | 26 +++++++++++----------- .../i3plus/pojo/model/form/ElementFormModel.java | 5 ++++- .../estsh/i3plus/pojo/model/form/ElementModel.java | 9 ++++---- .../cn/estsh/i3plus/pojo/model/form/FormModel.java | 14 +++++++----- .../pojo/model/form/FormOperateDataModel.java | 6 +++-- .../i3plus/pojo/model/form/SqlColumnModel.java | 8 ++++--- .../i3plus/pojo/model/form/SqlCreateDllModel.java | 10 ++++----- .../i3plus/pojo/model/form/SqlScriptModel.java | 6 +++-- .../i3plus/pojo/model/form/WmsPackageModel.java | 4 +++- .../pojo/model/lac/LacCommandStackModel.java | 17 ++++++++------ .../i3plus/pojo/model/lac/LacSuitRequest.java | 5 ++++- .../i3plus/pojo/model/lac/LacSuitResponse.java | 7 ++++-- .../java/cn/estsh/i3plus/pojo/model/lac/Task.java | 5 ++++- .../cn/estsh/i3plus/pojo/model/lac/TaskParam.java | 7 ++++-- .../pojo/model/license/ImppLicenseSenseshield.java | 5 ++++- .../pojo/model/report/BrDataSourceModel.java | 17 ++++++++------ .../pojo/model/report/BrDynamicPageModel.java | 12 +++++----- .../i3plus/pojo/model/report/TemplateModel.java | 10 ++++----- .../pojo/model/softswitch/SoftswitchIocModel.java | 5 ++++- .../pojo/model/softswitch/SuitClientModel.java | 14 +++++++----- .../pojo/model/softswitch/SuitImppCloudModel.java | 5 ++++- .../pojo/model/softswitch/SuitParamModel.java | 6 +++-- .../pojo/model/softswitch/SuitServerModel.java | 14 +++++++----- .../i3plus/pojo/model/test/TestConstructModel.java | 5 +++-- 29 files changed, 162 insertions(+), 107 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java index 29a4dbf..39f66b1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class CloudPagerModel { +public class CloudPagerModel implements Serializable { + private static final long serialVersionUID = 3091924006138375461L; @ApiParam("查询对象") private T obj; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java index 282c308..e6cc61a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java @@ -2,19 +2,19 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; -import java.util.Date; +import java.io.Serializable; /** * @Description : * @Reference : * @Author : Adair Peng * @CreateDate : 2018-12-11 15:37 - * @Modify: - * 动态 Table 单元格 + * @Modify: 动态 Table 单元格 **/ @Data -public class DynTableCell { +public class DynTableCell implements Serializable { + private static final long serialVersionUID = 3798664031371975269L; // 单元格名称 private String cellKey; // 排序 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 29b1b17..56e1cb7 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 @@ -2,6 +2,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; @@ -12,12 +13,12 @@ import java.util.Map; * @Reference : * @Author : Adair Peng * @CreateDate : 2018-12-11 15:37 - * @Modify: - * 动态Table Row + * @Modify: 动态Table Row **/ @Data -public class DynTableRow { +public class DynTableRow implements Serializable { + private static final long serialVersionUID = 2012638500620164166L; // 是否选中 private boolean isChecked; @@ -31,11 +32,11 @@ public class DynTableRow { private Integer cellSize = 0; // 行数据 - private Map cellMap = new HashMap<>(); + private Map cellMap = new HashMap<>(); - public DynTableRow putCell(DynTableCell cell){ - this.cellMap.put(cell.getCellKey(),cell); + public DynTableRow putCell(DynTableCell cell) { + this.cellMap.put(cell.getCellKey(), cell); return this; } @@ -45,8 +46,10 @@ public class DynTableRow { /** * 禁止外部给 Size 赋值 + * * @param cellSize */ - private void setCellSize(Integer cellSize) { } + private void setCellSize(Integer cellSize) { + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java index 047823a..91b5885 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java @@ -2,9 +2,8 @@ package cn.estsh.i3plus.pojo.model.dynamic.table; import lombok.Data; -import java.util.ArrayList; +import java.io.Serializable; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -12,14 +11,14 @@ import java.util.Map; * @Reference : * @Author : Adair Peng * @CreateDate : 2018-12-11 15:37 - * @Modify: - * 动态Table Row + * @Modify: 动态Table Row **/ @Data -public class ImppDynTable { +public class ImppDynTable implements Serializable { + private static final long serialVersionUID = 6634878862426951453L; // 行数据 - private Map table = new HashMap<>(); + private Map table = new HashMap<>(); // 表单标题 private String tableTitle; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java index 65eebf5..86eba82 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -19,8 +20,9 @@ import java.util.Map; **/ @Data @ApiModel("按钮操作数据模型") -public class BfButtonOperateDataModel { +public class BfButtonOperateDataModel implements Serializable { + private static final long serialVersionUID = 5592739471208814372L; @ApiModelProperty("按钮id") private Long buttonId; @@ -28,7 +30,7 @@ public class BfButtonOperateDataModel { private Long elementId; @ApiModelProperty("操作数据") - private List> operateData; + private List> operateData; @ApiModelProperty("按钮功能关系信息") private BfRefButtonMethod bfRefButtonMethod; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java index 57198b7..74edf0d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java @@ -3,10 +3,9 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.form.bean.BfDataObject; import cn.estsh.i3plus.pojo.form.bean.BfDataObjectProperty; -import io.swagger.annotations.ApiParam; import lombok.Data; -import org.apache.commons.lang3.StringUtils; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -18,8 +17,9 @@ import java.util.Map; * @Modify: **/ @Data -public class CloudFormModel { +public class CloudFormModel implements Serializable { + private static final long serialVersionUID = -4880909594223592633L; private BfDataObject dataObject; // 数据源编码 @@ -28,38 +28,38 @@ public class CloudFormModel { private String dataObjectCode; // 任何操作必填 必须真实 // 单条插入 - private Map insert; + private Map insert; // 单条修改 - private Map update; + private Map update; // 新增数据 - private List> insertList; + private List> insertList; // 修改条件 // private List updateConditionList; // 修改数据 - private List> updateList; + private List> updateList; // 查询数据 private List selectList; // 删除数据 - private List> deleteList; + private List> deleteList; - private Map delete; + private Map delete; public String orderByParam; public Integer ascOrDesc = 1; - public String orderBy(){ + public String orderBy() { String result = ""; - if (orderByParam!=null&&orderByParam.trim().length()>0) { + if (orderByParam != null && orderByParam.trim().length() > 0) { result = " order by " + orderByParam; - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; - }else{ + } else { result += " desc"; } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java index d39de03..05ca62a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : 数据操作Model * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; * @Modify: **/ @Data -public class ElementFormModel { +public class ElementFormModel implements Serializable { + private static final long serialVersionUID = 3215723235918474591L; //外键关联数据对象主键 @ApiParam(value = "元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java index 9954438..b1d2b85 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.form.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -8,8 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -20,8 +18,9 @@ import java.util.List; * @Modify: **/ @Data -public class ElementModel{ +public class ElementModel implements Serializable { + private static final long serialVersionUID = -8009888251366822835L; //外键关联数据对象主键 @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -64,7 +63,7 @@ public class ElementModel{ public String orderByParam; //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc - @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1") public Integer ascOrDesc = 1; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java index e8cc46b..eb23800 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java @@ -4,16 +4,17 @@ import cn.estsh.i3plus.pojo.form.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** * @Description : 表单模型 * - * 表单功能
- * 布局 功能明细
- * 自定义按钮
- * 元素
- * 元素按钮
+ * 表单功能
+ * 布局 功能明细
+ * 自定义按钮
+ * 元素
+ * 元素按钮
* * @Reference : * @Author : Adair Peng @@ -21,8 +22,9 @@ import java.util.List; * @Modify: **/ @Data -public class FormModel { +public class FormModel implements Serializable { + private static final long serialVersionUID = 146034689646326300L; // 表单功能 @ApiParam(value = "表单功能") private BfMethod method; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java index 3eb5e7a..d215bb5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -20,8 +21,9 @@ import java.util.Map; @Data @ApiModel("表单操作数据模型") @NoArgsConstructor -public class FormOperateDataModel { +public class FormOperateDataModel implements Serializable { + private static final long serialVersionUID = 7674678844523192310L; @ApiModelProperty("关联标识") private String refId; @@ -36,6 +38,6 @@ public class FormOperateDataModel { private String sourceName; @ApiModelProperty("操作数据集合") - private List> operateDataList; + private List> operateDataList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java index ae774f8..bc5daaf 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java @@ -1,10 +1,11 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -13,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class SqlColumnModel { -// isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer +public class SqlColumnModel implements Serializable { + private static final long serialVersionUID = -8437573966195980847L; + // isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer // isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 50 getColumnLabel name getColumnName name getSchemaName getPrecision 50 getScale 0 getTableName interceptor getColumnType 12 getColumnTypeName VARCHAR getColumnClassName java.lang.String // isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel age getColumnName age getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer // isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 19 getColumnLabel date_time getColumnName date_time getSchemaName getPrecision 19 getScale 0 getTableName interceptor getColumnType 93 getColumnTypeName TIMESTAMP getColumnClassName java.sql.Timestamp diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java index a518608..5f03036 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java @@ -1,12 +1,9 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.form.bean.BfDataObject; -import io.swagger.annotations.ApiParam; import lombok.Data; -import org.apache.commons.lang3.StringUtils; +import java.io.Serializable; import java.util.List; -import java.util.Objects; /** * @Description : @@ -16,8 +13,9 @@ import java.util.Objects; * @Modify: **/ @Data -public class SqlCreateDllModel { +public class SqlCreateDllModel implements Serializable { + private static final long serialVersionUID = -1294648161172538340L; private String tableCat; private String tableSchem; private String tableName; @@ -29,6 +27,6 @@ public class SqlCreateDllModel { private String selfReferencingColName; private String refGeneration; - List columnlist ; + List columnlist; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java index 90d9313..b3dd987 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -16,14 +17,15 @@ import java.util.List; * @Modify: **/ @Data -public class SqlScriptModel { +public class SqlScriptModel implements Serializable { + private static final long serialVersionUID = 512077813851983749L; @ApiParam(value = "对象元素ID") @JsonSerialize(using = ToStringSerializer.class) private Long elementId; @ApiParam(value = "元素内容") - private String elementContent ; + private String elementContent; @ApiParam(value = "动态对象Class") private Class dynClass; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java index c9c9845..9cb7ac3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.wms.bean.WmsPackage; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -13,8 +14,9 @@ import java.util.List; * @Modify: **/ @Data -public class WmsPackageModel { +public class WmsPackageModel implements Serializable { + private static final long serialVersionUID = -6308064202329492679L; List wmsPackageList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index ddcfd44..1911043 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; import lombok.Data; import org.slf4j.LoggerFactory; +import java.io.Serializable; + /** * @Description : lac指令集model * @Reference : @@ -13,8 +15,9 @@ import org.slf4j.LoggerFactory; * @Modify: **/ @Data -public class LacCommandStackModel { +public class LacCommandStackModel implements Serializable { + private static final long serialVersionUID = -8453748548383071954L; /** * 指令集记录id */ @@ -46,17 +49,17 @@ public class LacCommandStackModel { private Exception exception; - public void setException(Exception exception){ - LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception); + public void setException(Exception exception) { + LoggerFactory.getLogger("YYYY").error("异常信息：{}", exception); this.exception = exception; } - public void setCommandStackRecord(LacCommandStackRecord commandStackRecord){ + public void setCommandStackRecord(LacCommandStackRecord commandStackRecord) { this.commandStackRecord = commandStackRecord; this.recordId = commandStackRecord.getId(); } - public Object getTaskRequestParam(LacCommandStackStepTask stepTask){ + public Object getTaskRequestParam(LacCommandStackStepTask stepTask) { for (Task task : this.getRequest().getTaskList()) { // 步骤代码为空时匹配所有任务参数 if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) { @@ -69,8 +72,8 @@ public class LacCommandStackModel { return null; } - public Long getRecordId(){ - if(recordId == null &&this.commandStackRecord !=null){ + public Long getRecordId() { + if (recordId == null && this.commandStackRecord != null) { this.recordId = this.commandStackRecord.getId(); } return recordId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java index 005846b..3977d09 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.lac; import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; + +import java.io.Serializable; import java.util.List; /** @@ -14,8 +16,9 @@ import java.util.List; **/ @Data @XStreamAlias("request") -public class LacSuitRequest { +public class LacSuitRequest implements Serializable { + private static final long serialVersionUID = 9078681515190902399L; /** * 指令集代码 */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java index 46a58d5..0a22ea5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; +import java.io.Serializable; + /** * @Description : lac 适配响应信息 * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @XStreamAlias("response") -public class LacSuitResponse { +public class LacSuitResponse implements Serializable { + private static final long serialVersionUID = -4119301611637726729L; /** * 是否成功 */ @@ -35,7 +38,7 @@ public class LacSuitResponse { */ private Object result; - public LacSuitResponse(){ + public LacSuitResponse() { this.success = true; this.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); this.message = ResourceEnumUtil.MESSAGE.SUCCESS.getDescription(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java index ce9d8c2..143d11d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -13,8 +15,9 @@ import lombok.Data; **/ @Data @XStreamAlias("task") -public class Task { +public class Task implements Serializable { + private static final long serialVersionUID = 1504165068471696209L; private String code; private String stepCode; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java index 40bc9c6..2007630 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java @@ -5,6 +5,8 @@ import com.thoughtworks.xstream.annotations.XStreamConverter; import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -14,9 +16,10 @@ import lombok.Data; **/ @Data @XStreamAlias("param") -@XStreamConverter(value= ToAttributedValueConverter.class, strings={"value"}) -public class TaskParam { +@XStreamConverter(value = ToAttributedValueConverter.class, strings = {"value"}) +public class TaskParam implements Serializable { + private static final long serialVersionUID = 749532390986966416L; private String name; private String value; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java index 4606b0e..d011da9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.license; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -10,9 +12,10 @@ import lombok.Data; * @Modify: **/ @Data -public class ImppLicenseSenseshield { +public class ImppLicenseSenseshield implements Serializable { + private static final long serialVersionUID = 3227502901235303725L; /** * license_id : 170817 * enable : true diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java index e23b1ad..99af036 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java @@ -4,36 +4,39 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : - * 自定义报表数据源传输对象 ， 单纯数据传输使用并不做保存使用 + * 自定义报表数据源传输对象 ， 单纯数据传输使用并不做保存使用 * @Reference : * @Author : wei.peng * @CreateDate : 19-12-5 下午4:02 * @Modify: **/ @Data -public class BrDataSourceModel { +public class BrDataSourceModel implements Serializable { /** * 默认数据源信息 */ public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", CommonEnumUtil.DATA_SOURCE_TYPE.SOURCE_MARIA_DB.getValue(), null, "使用默认数据源"); + private static final long serialVersionUID = -5137576929473857749L; - @ApiParam(value ="数据源名称") + @ApiParam(value = "数据源名称") private String sourceName; - @ApiParam(value ="数据源编码") + @ApiParam(value = "数据源编码") private String sourceCode; - @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") + @ApiParam(value = "数据源类型", name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") private Integer sourceType; - @ApiParam(value ="数据库名称") + @ApiParam(value = "数据库名称") private String sourceDataBaseName; - @ApiParam(value ="数据源描述") + @ApiParam(value = "数据源描述") private String sourceDescription; public BrDataSourceModel() { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java index 9dc5df5..d0fdd09 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.report.bean.BrReport; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -17,21 +18,22 @@ import java.util.List; * @Modify: **/ @Data -public class BrDynamicPageModel { +public class BrDynamicPageModel implements Serializable { - @ApiParam(value ="报表信息") + private static final long serialVersionUID = -5054183081964783780L; + @ApiParam(value = "报表信息") private BrReport report; - @ApiParam(value ="布局信息") + @ApiParam(value = "布局信息") private BrLayout layout; @ApiParam(value = "报表排版关系") private List refReportList; - @ApiParam(value ="页面元素内容") + @ApiParam(value = "页面元素内容") private List elementList; - @ApiParam(value ="页面元素内容") + @ApiParam(value = "页面元素内容") private List templateModelList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index c29a77b..0df0e9c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -23,17 +23,17 @@ import java.util.Map; public class TemplateModel implements Serializable { private static final long serialVersionUID = -6385070202088819367L; - @ApiParam(value ="视图ID") + @ApiParam(value = "视图ID") @JsonSerialize(using = ToStringSerializer.class) private Long viewId; - @ApiParam(value ="视图类型") + @ApiParam(value = "视图类型") private Integer viewType; - @ApiParam(value ="视图名称") + @ApiParam(value = "视图名称") private String viewName; - @ApiParam(value ="返回信息") + @ApiParam(value = "返回信息") private String resultMessage; @ApiParam(value = "查询对象") @@ -76,7 +76,7 @@ public class TemplateModel implements Serializable { private Pager pager; @ApiParam(value = "页面查询条件") - private Map findParam; + private Map findParam; @ApiParam("执行 HQL ") private String selectSql; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java index b5c8c0a..0be8fb7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.softswitch; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -10,7 +12,8 @@ import lombok.Data; * @Modify: **/ @Data -public class SoftswitchIocModel { +public class SoftswitchIocModel implements Serializable { + private static final long serialVersionUID = 8945557825392215914L; /* Spring Ioc Bean 名称 */ private String beanName; /* Spring Ioc 需要管理的Bean */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 806c17b..7241fe9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -11,6 +11,8 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -20,8 +22,9 @@ import lombok.Data; **/ @Data @XStreamAlias("client") -public class SuitClientModel { +public class SuitClientModel implements Serializable { + private static final long serialVersionUID = -1073627855304303961L; /** * 适配套件代码 */ @@ -62,12 +65,13 @@ public class SuitClientModel { */ private Integer suitMethodId; - public int getSuitMethodIdVal(){ - if(suitMethodId == null){ + public int getSuitMethodIdVal() { + if (suitMethodId == null) { return -1; } return suitMethodId.intValue(); } + /** * 适配状态码 */ @@ -98,7 +102,7 @@ public class SuitClientModel { public SuitClientModel() { } - public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) { + public SuitClientModel(Integer requestSource, BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); @@ -114,7 +118,7 @@ public class SuitClientModel { this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } - public SuitClientModel(Integer requestSource,Integer suitMethodId,BsSuitCaseModel suitCaseModel) { + public SuitClientModel(Integer requestSource, Integer suitMethodId, BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; this.suitMethodId = suitMethodId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java index 83ac2e0..28de3a4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.softswitch; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -11,8 +13,9 @@ import lombok.Data; * @Modify: **/ @Data -public class SuitImppCloudModel { +public class SuitImppCloudModel implements Serializable { + private static final long serialVersionUID = -8731173690394189107L; @ApiParam(value = "适配器信息") private BsSuitCaseModel model; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java index ec7dd0a..9963d36 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.softswitch; import lombok.Data; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -13,8 +14,9 @@ import java.util.Map; * @Modify: **/ @Data -public class SuitParamModel { +public class SuitParamModel implements Serializable { + private static final long serialVersionUID = -1695550139368764444L; /* 标签名称 */ private String tagName; /* 标签 Class Path */ @@ -36,7 +38,7 @@ public class SuitParamModel { private String type; /* 标签属性 */ - private Map attr; + private Map attr; /* 父节点 */ private SuitParamModel parent; /* 标签子集 */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index cb371c4..e859e21 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -24,10 +25,11 @@ import java.util.Map; **/ @Data @XStreamAlias("server") -@XmlRootElement(name ="server") +@XmlRootElement(name = "server") @XmlAccessorType(XmlAccessType.NONE) -public class SuitServerModel { +public class SuitServerModel implements Serializable { + private static final long serialVersionUID = 3501193688956575386L; // 执行方法命令 @XmlElement @ApiParam(value = "适配器code") @@ -43,7 +45,7 @@ public class SuitServerModel { // 传输集合 private List list; // 传输键值对 - private Map map; + private Map map; // 传输 JSON 数据 private String json; @@ -91,13 +93,13 @@ public class SuitServerModel { // @XStreamImplicit private Integer suitMethodId; - public int getSuitMethodIdVal(){ - if(suitMethodId == null){ + public int getSuitMethodIdVal() { + if (suitMethodId == null) { return -1; } return suitMethodId.intValue(); } -// @XStreamImplicit + // @XStreamImplicit private String analyzeMessage; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java index 8f48c15..6729915 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java @@ -4,8 +4,8 @@ import cn.estsh.i3plus.pojo.platform.bean.TestTransUser; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.aspectj.weaver.ast.Test; +import java.io.Serializable; import java.util.List; /** @@ -18,8 +18,9 @@ import java.util.List; @Getter @Setter @ToString -public class TestConstructModel { +public class TestConstructModel implements Serializable { + private static final long serialVersionUID = 3347578209875237950L; private long id; private TestTransUser user; From 8fe0244a2071ccdb1af6419649d46e38c6a7cb0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 14 May 2020 10:19:49 +0800 Subject: [PATCH 122/134] =?UTF-8?q?POJO=E6=B7=BB=E5=8A=A0=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8C=96id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 1 + 5 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index 785c3dd..2ebfb5c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -31,6 +31,7 @@ import javax.persistence.Table; public class SysLogConsole extends BaseBean { + private static final long serialVersionUID = -6073378683575266830L; /******** 服务器信息 ********/ @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index e4b46a1..e561fa3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { + private static final long serialVersionUID = -2844455884020022321L; //CommonEnumUtil.SOFT_TYPE @Indexed @Column(name="EXC_MODULE_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index c9d392c..ed652e4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -34,6 +34,7 @@ import javax.persistence.Table; @Api(value="操作日志表",description = "操作日志表") public class SysLogOperate extends BaseBean { + private static final long serialVersionUID = 1515035521283176727L; @Indexed @Column(name="OPERATE_MODULE") @ApiParam(value ="系统模块（枚举）", example = "1") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index 5d81ed5..8919173 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -34,6 +34,7 @@ import javax.persistence.Table; @Api(value="系统日志表",description = "系统日志表") public class SysLogSystem extends BaseBean { + private static final long serialVersionUID = -2209777442410263684L; @Indexed @Column(name="LOG_LEVEL") @ApiParam(value ="日志级别" , example ="1") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index fedc271..795653a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { + private static final long serialVersionUID = -841008177433745529L; @Column(name="SCHEDULER_INSTANCE_ID") @ApiParam(value ="调度器实例id") private String schedulerInstanceId; From 717f268c280da4c1a7f0de6bbf6eeba996c5b223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 14 May 2020 10:24:33 +0800 Subject: [PATCH 123/134] =?UTF-8?q?POJO=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= 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/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 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 a9e288f..b948580 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 a44418c..e12eaee 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 2de88b5..c338f71 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 50ab2c2..7637865 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 7f94617..d98b7d8 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 60fc467..a758a6a 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 d65e031..efacfd2 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 a785f21..dba12cc 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 d6d2f8e..81670b2 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 0fbfb69..26a7311 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 76739f9..eaf2544 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 0368700..0f615b6 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 b2eedd4..9e5f745 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 5fcd08a..0fea52b 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 2eddf76..cc8fce6 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 25bd05348de8cffc8fbbd033161f4c3bc3140b4b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 14 May 2020 10:33:46 +0800 Subject: [PATCH 124/134] =?UTF-8?q?[serialVersionUID=E9=87=8D=E5=A4=8D?= =?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/mes/bean/BasVendor.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java | 3 +-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java | 3 +-- .../cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java | 1 + .../java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java | 3 +-- .../cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java | 3 +-- .../java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) 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 30e8294..eb1c3c2 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 @@ -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 : 供应商 @@ -26,9 +27,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="BAS_VENDOR") @Api("供应商信息") -public class BasVendor extends BaseBean{ +public class BasVendor extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8041987864739007553L; - private static final long serialVersionUID = 9214639813072592779L; @Column(name="VENDOR_NO") @ApiParam("供应商编号") private String vendorNo; 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 f7a2098..b340d1a 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 @@ -30,7 +30,7 @@ import java.io.Serializable; @Table(name = "if_queue_shipping") @Api("JIT发运数据同步") public class IfQueueShipping extends BaseBean implements Serializable { - private static final long serialVersionUID = -8961182851667690154L; + private static final long serialVersionUID = -3385698810529084423L; @Column(name = "JIT_NO") @ApiParam("JIT队列编号") private String jitNo; 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 f11ae4d..2a23858 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 @@ -27,8 +27,8 @@ import java.util.List; @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean implements Serializable { - private static final long serialVersionUID = 5371856566557305323L; + private static final long serialVersionUID = -7758794366003399222L; @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; 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 5b17a07..36fb0a3 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 @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 6476163540527157643L; + private static final long serialVersionUID = -6834031991151345038L; @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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 d40e746..83c18ad 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 @@ -68,11 +68,11 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,3)") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)") @ApiParam("总生产时间") private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,3)") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)") @ApiParam("总停机时间") private Double totalStopTime; @@ -92,19 +92,19 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE", columnDefinition = "decimal(18,3)") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)") @ApiParam("时间开动率") private Double timeRate; - @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,3)") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)") @ApiParam("性能开动率") private Double taktRate; - @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,3)") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)") @ApiParam("良品率") private Double qualifiedRate; - @Column(name = "OEE", columnDefinition = "decimal(18,3)") + @Column(name = "OEE", columnDefinition = "decimal(18,4)") @ApiParam("OEE") private Double oee; 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 94a4da7..2385ff4 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 @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class MesPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = 2756240593256441951L; + private static final long serialVersionUID = 2756240593256441951L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; 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 dc26568..b5d583b 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 @@ -31,8 +31,7 @@ import java.io.Serializable; @Table(name = "MES_PCN_SYS_USER_OFFLINE") @Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class MesPcnSysUserOffline extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7617353154826718154L; + private static final long serialVersionUID = -7483799830588482021L; @Column(name = "USER_ID") @ApiParam(value = "人员ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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 d483cd6..a9d885f 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 @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PCN_TASK_LOG") @Api("mes-pcn定时任务工作清单同步记录") public class MesPcnTaskLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -784806389462540310L; + private static final long serialVersionUID = 1175730596573636224L; @Column(name = "SYNC_TIME_START") @ApiParam("同步数据开始时间") private String syncTimeStart; 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 73fae24..0ccadd4 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 @@ -29,6 +29,7 @@ import java.math.BigDecimal; @Api("散件产品配置明细") public class MesProdScatterCfgBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -6413857842993992190L; @Column(name = "SP_CFG_CODE") @ApiParam("散件配置编码") private String spCfgCode; 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 654cc56..00efaba 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 @@ -30,8 +30,7 @@ import java.io.Serializable; @Api("MES_客户JIT生产队列明细") public class MesQueueJitActualDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 1442091799346314190L; - + private static final long serialVersionUID = 3211496242571643906L; @Column(name = "JIS_ACTUAL_NO") @ApiParam("队列编号") private String jisActualNo; 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 cb0457f..44a5022 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 @@ -29,6 +29,7 @@ import java.math.BigDecimal; @Api("MES_散件配置报文关系") public class MesScatterCfgDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 1633467451954028328L; @Column(name = "SP_CFG_CODE") @ApiParam("散件配置编码") private String spCfgCode; 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 1672c91..63d6212 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 @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_STATE_MACHINE") @Api("MES状态机") public class MesStateMachine extends BaseBean implements Serializable { - private static final long serialVersionUID = 6093522587973076640L; + private static final long serialVersionUID = 4532746282478232478L; @Column(name = "SM_CODE") @ApiParam("状态机代码") private String smCode; 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 3692f51..11a7383 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 @@ -31,8 +31,8 @@ import java.util.List; }) @Api("数据同步死信") public class MesSyncDeadLetter extends BaseBean implements Serializable { - private static final long serialVersionUID = 1151025992437433734L; + private static final long serialVersionUID = -6427776318518431855L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; 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 326dafe..11da3c6 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 @@ -22,8 +22,8 @@ import java.io.Serializable; @Table(name = "MES_TIME") @Api("工步参数") public class MesTime extends BaseBean implements Serializable { - private static final long serialVersionUID = 1562011791394529076L; + private static final long serialVersionUID = 5447356026236056885L; @Column(name = "MODULE") @ApiParam("组件") private String module; 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 570ffd1..56743f5 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 @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 2900363253333046861L; + private static final long serialVersionUID = 8916087884118304236L; @Column(name = "SN") @ApiParam("过程条码") private String serialNumber; 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 cd8463a..ed04956 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 @@ -32,8 +32,8 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = -6817903235638554748L; + private static final long serialVersionUID = -6817903235638554748L; @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/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 9b36072..53ce112 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 @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_WORK_CELL_POINT_GROUP") @Api("工站分组队列") public class MesWorkCellPointGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = -6817903235638554748L; + private static final long serialVersionUID = -7544627137183733563L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index 151b5ef..bc6bb5f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -23,8 +23,7 @@ import java.util.ArrayList; @ElasticSearch public class EsProductDataModule extends BaseBean implements Serializable { - private static final long serialVersionUID = 4514407617515827040L; - + private static final long serialVersionUID = -5907453749571718168L; @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java index 635c74d..4a4db6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java @@ -18,8 +18,7 @@ import lombok.Data; @Api(value="生产配方模板",description = "生产配方模板") public class MesPartFormulaModel extends BaseBean { - private static final long serialVersionUID = 2167743108452607620L; - + private static final long serialVersionUID = 5790342327875844545L; @ApiParam(value = "组号") @AnnoOutputColumn private String groupNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java index a2464b7..509e085 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java @@ -16,8 +16,8 @@ import java.util.Map; @Data @Api("下拉工步参数对象") public class StepParamsModel implements Serializable { - private static final long serialVersionUID = -6361645141217616499L; + private static final long serialVersionUID = -4418226170535844209L; @ApiParam("参数代码") private String paramCode; From 8d61db5ed51d3825902f71a2111d98eb2a01f643 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 14 May 2020 11:00:57 +0800 Subject: [PATCH 125/134] =?UTF-8?q?=E4=BB=BB=E5=8A=A1:1786,1787,1788,1789?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 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 592245d..6dd13e1 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 @@ -881,7 +881,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -2831,7 +2831,7 @@ public class WmsEnumUtil { // 根据枚举编号获取语言代码 public static String getCodeByIndex(Integer index) { for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) { - if (languageType.getValue() == index.intValue()) { + if (languageType.getValue() == index) { return languageType.getDescription(); } } @@ -3298,7 +3298,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3381,7 +3381,7 @@ public class WmsEnumUtil { } public static Map getEnumByName(String enumName) throws Exception { - Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 + Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 Class clazz; Enum[] enumConstants; @@ -3479,7 +3479,7 @@ public class WmsEnumUtil { public static String getDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == code) { + if (values()[i].value.equals(code)) { tmp = values()[i].description; } } @@ -3727,7 +3727,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3767,7 +3767,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3901,7 +3901,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -6655,6 +6655,11 @@ public class WmsEnumUtil { return tmp; } + 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++) { @@ -6665,8 +6670,8 @@ public class WmsEnumUtil { return tmp; } - public static int descriptionOfValue(String desc) { - return descOf(desc); + public static String valueOfDescription(int val) { + return valueOf(val); } } From 373808e20def5f8868511b9cd731760daaf924a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 14 May 2020 13:12:05 +0800 Subject: [PATCH 126/134] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=90192?= =?UTF-8?q?8=E3=80=91-=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B=E5=8D=95-?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9code=E6=8F=8F=E8=BF=B0?= 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, 2 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 e560fb7..eba9bab 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 @@ -2564,11 +2564,11 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - INCOMING_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"), + INCOMING_CHECK(5, "INCOMING_CHECK", "来料检验"), FIRST_CHECK(10, "FIRST_CHECK", "首检"), ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), END_CHECK(30, "END_CHECK", "末检"), - RC_CHECK(40, "EDELIVERY_CHECK", "发货检验"); + RC_CHECK(40, "RC_CHECK", "发货检验"); private int value; private String code; From 3ffa9d06facd4906fb55961f7e1618dc65175306 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 14 May 2020 16:00:51 +0800 Subject: [PATCH 127/134] =?UTF-8?q?sweb=20pojo=20=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java | 1 + .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java | 1 + .../cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java | 1 + .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 1 + .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 1 + .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java | 1 + .../java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java | 1 + .../estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java | 1 + .../i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java | 1 + .../i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java | 1 + .../cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java | 1 + .../i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java | 1 + .../estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java | 1 + .../estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java | 1 + .../i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java | 2 +- 19 files changed, 19 insertions(+), 2 deletions(-) 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 ccfef29..9fa4fcf 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,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -27,6 +26,7 @@ import javax.persistence.Table; @Api(value = "系统配置", description = "SWEB系统配置") public class SwebConfig extends BaseBean { + private static final long serialVersionUID = -3064110608740977782L; @Column(name = "NAME") @ApiParam(value = "名称") private String name; 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 2bb1f98..c3d0e27 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("订单发货通知记录表") public class SwebOrderDeliveryLog extends BaseBean { + private static final long serialVersionUID = -5505138833474471710L; @Column(name = "ORDER_ITEM_NO") @ApiParam("单据明细编号") private String orderItemNo; 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 83ad7ca..cde67c9 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 @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("物理包装") public class SwebPackage extends BaseBean { + private static final long serialVersionUID = 4329007629113785744L; @Column(name="PACKAGE_NO") @ApiParam("包装编号") private String packageNo; 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 df34d26..e627eee 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("开口合同主表") public class SwebProcurementPlanOrder extends BaseBean { + private static final long serialVersionUID = -868499874950128043L; @ApiParam("合同号") @Column(name = "ORDER_NO") private String orderNo; 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 f9132ff..6e049d3 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 @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("开口合同明细表") public class SwebProcurementPlanOrderDetails extends BaseBean { + private static final long serialVersionUID = 6437822344590464188L; @ApiParam("单据号") @Column(name = "ORDER_NO") private String orderNo; 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 3e86f3d..de0243b 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 @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("订单修改日志记录表") public class SwebPurchaseChangeLog extends BaseBean { + private static final long serialVersionUID = 4565614096003156828L; @Column(name = "ORDER_NO") @ApiParam("单据明细编号") private String orderNo; 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 fe4aff9..dde1758 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 @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("采购订单表-主表") public class SwebPurchaseOrder extends BaseBean { + private static final long serialVersionUID = -3748055439346407775L; @Column(name = "ORDER_NO") @ApiParam("单据号") public String orderNo; 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 18df792..7eba5df 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 @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("采购订单表-明细表") public class SwebPurchaseOrderDetails extends BaseBean { + private static final long serialVersionUID = -7410188512201254931L; @Column(name = "ORDER_NO") @ApiParam("单据号") private String orderNo; 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 3e8eb11..8140da3 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 @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("采购订单表-条码明细表") public class SwebPurchaseOrderSn extends BaseBean { + private static final long serialVersionUID = 2226619667893717305L; @Column(name = "ORDER_NO") @ApiParam("单据明细编号") private String orderNo; 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 ba03cc8..d4afe0c 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("供应商关系表") public class SwebVendorRel extends BaseBean { + private static final long serialVersionUID = -283156702431035689L; @ApiParam("计划员代码") @Column(name = "PLANNER_CODE") private String plannerCode; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index 1c9cb27..cf8bf64 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -17,6 +17,7 @@ import java.io.Serializable; @AllArgsConstructor public class SwebLoginUserModel implements Serializable { + private static final long serialVersionUID = -2494619756222719468L; @ApiParam(value = "用户ID") private Long id; 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 3f5d66b..bad9575 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 @@ -18,6 +18,7 @@ import java.util.Map; @Data public class SwebPOBatchInsertEnterModel extends BaseBean { + private static final long serialVersionUID = -7184098625336146560L; @ApiParam("单据号") private String orderNo; 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 5294bcf..03b46e7 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 @@ -16,6 +16,7 @@ import java.io.Serializable; @Data public class SwebPOBatchInsertItemEnterModel implements Serializable { + private static final long serialVersionUID = 4003058741886494009L; @ApiParam(value = "零件号") private String partNo; 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 8cbf146..e0e7a1f 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 @@ -16,6 +16,7 @@ import lombok.Data; @Data public class SwebPODetailsUpdateHistoryModel extends BaseBean { + private static final long serialVersionUID = -9085820300059480272L; @ApiParam("单据号") private String orderNo; 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 4f50d7f..0f47fc7 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 @@ -14,6 +14,7 @@ import lombok.Data; @Data public class SwebPOForPubListEnterModel extends BaseBean { + private static final long serialVersionUID = -2116328977150605750L; @ApiParam("单据号") private String orderNo; 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 780d3be..3d2ad2e 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 @@ -18,6 +18,7 @@ import java.util.Map; @Data public class SwebPOForPubListResultItemModel extends BaseBean { + private static final long serialVersionUID = -6156680045478117732L; @Column(name = "ORDER_NO") @ApiParam("单据号") private String orderNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java index 4c2464f..b5f7507 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java @@ -17,6 +17,7 @@ import java.util.List; @Data public class SwebPOForPubListResultModel extends BaseBean { + private static final long serialVersionUID = 3662427372635980801L; @ApiParam(value = "拆分请求时间数量列表", example = "1") private List reqTimeList; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java index ee15a2a..99cbd5f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java @@ -17,6 +17,7 @@ import java.util.List; @Data public class SwebPOForPubListResultModelV2 extends BaseBean { + private static final long serialVersionUID = -6692335488511053499L; @ApiParam(value = "拆分请求时间数量列表", example = "1") private List reqTimeList = Collections.EMPTY_LIST; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java index 31ee5c5..38ce2e3 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.sweb.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.bean.ListPager; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -17,6 +16,7 @@ import java.util.List; @Data public class SwebPOUpdatePublishForPublishModel extends BaseBean { + private static final long serialVersionUID = 8456615874926744777L; @ApiParam(value = "拆分请求时间数量列表", example = "1") private List reqTimeList; From d2a31eac70813a6c91396094d8178daff18fcec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 14 May 2020 17:55:13 +0800 Subject: [PATCH 128/134] =?UTF-8?q?=E3=80=901804=20=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=A3=80=E6=B5=8B-=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 8 +++ .../pojo/mes/bean/MesLoopQcGenerateDetail.java | 58 +++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 8 +++ .../pojo/mes/model/IfQcOrderRcCheckModel.java | 73 ++++++++++++++++++++++ .../MesLoopQcGenerateDetailRepository.java | 15 +++++ 6 files changed, 166 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.java 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 cb47ab9..924fc78 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 @@ -86,4 +86,12 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("接口代码") private String ifCode; + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "DELIVERY_DATE") + @ApiParam("发运时间") + private String deliveryDate; + } 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 new file mode 100644 index 0000000..6a2d772 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java @@ -0,0 +1,58 @@ +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: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LOOP_QC_GENERATE_DETAIL") +@Api("MES_巡检项生成明细") +public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "LASR_TIME") + @ApiParam("末次时间") + private String lasrTime; + + @ApiParam(value = "物料号") + @Transient + private String partNo; + + @ApiParam(value = "产线") + @Transient + private String workCenterCode; +} 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 48a7682..c6a3d0a 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 @@ -80,6 +80,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("检测项类型") private String checkItemType; + @Column(name = "CHECK_INTERVAL") + @ApiParam("间隔时间") + private Integer checkInterval = 0; + @Transient @ApiParam("检测类型名称") private String checkTypeName; 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 93b3627..26afb75 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 @@ -92,6 +92,14 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("备注") private String memo; + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "DELIVERY_DATE") + @ApiParam("发运时间") + private String deliveryDate; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java new file mode 100644 index 0000000..c8c44fe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java @@ -0,0 +1,73 @@ +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.NoArgsConstructor; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\18 9:34 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("QC质检单model（发货检验）") +public class IfQcOrderRcCheckModel extends BaseBean { + + @ApiParam("Ruid") + private Long ruid; + + @ApiParam("单据号") + private String orderNo; + + @ApiParam("发运时间") + private String deliveryDate; + + @ApiParam("客户代码") + private String customerCode; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("计划数量") + private Double orderQty; + + @ApiParam("工厂代码") + private String factoryCode; + + @ApiParam("客户发往地代码") + private String customerDeliveryCode; + + @ApiParam("物流供应商") + private String option1; + + @ApiParam("业务类型") + private String checkType; + + @ApiParam("到达时间") + private Double arrivalDate; + + @ApiParam("运输方式") + private String transportTypeDesc; + + @ApiParam("发出地") + private String srcSite; + + @ApiParam("发往地") + private String destSite; + + @ApiParam("运输类型") + private String transportClass; + + @ApiParam("同步状态") + private Integer syncStatus; + + @ApiParam("错误信息") + private String errMsg; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.java new file mode 100644 index 0000000..adc7e25 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.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.IfPackageDetail; +import cn.estsh.i3plus.pojo.mes.bean.MesLoopQcGenerateDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesLoopQcGenerateDetailRepository extends BaseRepository { +} From 30fcf4f23f10cbf2388a1446f1cc1c2c52e0e8d6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 14 May 2020 18:30:08 +0800 Subject: [PATCH 129/134] =?UTF-8?q?pom=E5=86=B2=E7=AA=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/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 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 b948580..a9e288f 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 e12eaee..a44418c 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 c338f71..2de88b5 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 7637865..50ab2c2 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 d98b7d8..7f94617 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 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 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..60fc467 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 efacfd2..d65e031 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 dba12cc..a785f21 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 81670b2..d6d2f8e 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 26a7311..0fbfb69 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 eaf2544..76739f9 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 0f615b6..0368700 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 9e5f745..b2eedd4 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 0fea52b..5fcd08a 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 cc8fce6..2eddf76 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 fc99ee8914c84e19d6d367371fd16aa64ba38ebd Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 14 May 2020 19:00:10 +0800 Subject: [PATCH 130/134] =?UTF-8?q?pojo=20=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java | 6 +++++- .../cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java | 6 ++++-- .../cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 4 +++- .../cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java | 3 ++- .../cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java | 3 ++- .../cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java | 1 + .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java | 6 ++++-- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java | 6 ++++-- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java | 6 +++++- .../cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java | 3 ++- .../java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java | 2 ++ 100 files changed, 293 insertions(+), 99 deletions(-) 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 749eae4..c8767a5 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_呼叫原因 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "ANDON_呼叫原因") -public class AndonAlarmCause extends BaseBean { +public class AndonAlarmCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5837347497945981811L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") 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 1ec4182..0594355 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 安灯子类型 @@ -28,7 +29,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯子类型") -public class AndonAlarmDetailType extends BaseBean { +public class AndonAlarmDetailType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1540491136291384925L; @Column(name = "ALARM_DETAIL_CODE") @ApiParam(value = "安灯子类型编码") 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 e0bbc8e..286fcbc 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_呼叫通知配置 @@ -28,7 +29,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_呼叫通知配置") -public class AndonAlarmResponseCfg extends BaseBean { +public class AndonAlarmResponseCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4302725908675374347L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") 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 afd4cb0..82bfda2 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :安灯广播 @@ -27,7 +28,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_BROADCAST") @Api("安灯广播") -public class AndonBroadCast extends BaseBean { +public class AndonBroadCast extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5383684820100076411L; + @Column(name="DEVICE_NUM") @ApiParam("广播设备编号") private String targetIds; 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 750e650..698bebb 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -30,7 +31,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_BROADCAST_CFG") @Api("生产区域") -public class AndonBroadCastCfg extends BaseBean { +public class AndonBroadCastCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5434544329665544113L; + @Column(name="ALARM_CODE") @ApiParam("安灯类型代码") private String alarmCode; 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 9d9df79..2e8c77e 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_工作单元呼叫原因配置 @@ -29,7 +30,10 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元呼叫原因配置") -public class AndonCellAlarmCause extends BaseBean { +public class AndonCellAlarmCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3623997837738333774L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; 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 1be0a94..abf5ff9 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_工作单元事件原因配置 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元事件原因配置") -public class AndonCellEventCause extends BaseBean { +public class AndonCellEventCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1641944472466007171L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") 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 00dea5f..23c8d1b 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_工作单元处理方法配置 @@ -29,7 +30,10 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元处理方法配置") -public class AndonCellEventMethod extends BaseBean { +public class AndonCellEventMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8681966862823447650L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; 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 8cfd0b7..ef790dc 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 @@ -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 : ANDON_工作单元事件现象 @@ -26,7 +27,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元事件现象") -public class AndonCellEventPhenomenon extends BaseBean { +public class AndonCellEventPhenomenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4413846938406056923L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") 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 c194faf..cd82b84 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 @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_工位分组配置 @@ -29,7 +30,10 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_工位分组配置") -public class AndonCellGroupCfg extends BaseBean { +public class AndonCellGroupCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4801397986303698999L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; 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 0f39a62..a6653c7 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 @@ -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 : 系统参数配置 @@ -26,7 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_CONFIG") @Api(value="系统配置") -public class AndonConfig extends BaseBean { +public class AndonConfig extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3284234821448139251L; @Column(name="NAME") @ApiParam(value ="名称") 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 9f8d287..1db40c9 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 @@ -14,7 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.List; +import java.io.Serializable; /** * @Description : ANDON_自处理配置 @@ -30,7 +30,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_自处理配置") -public class AndonDisposalCfg extends BaseBean { +public class AndonDisposalCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 161656982939855466L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") 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 83e1572..d2bd2cd 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 @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: 自处理维护配置 @@ -29,7 +30,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("Andon自处理维护配置") -public class AndonDisposalMaintenCfg extends BaseBean { +public class AndonDisposalMaintenCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 474667557264134793L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") 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 2491043..91bb41b 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_事件原因 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "ANDON_事件原因") -public class AndonEventCause extends BaseBean { +public class AndonEventCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3051829000971794178L; @Column(name = "EC_CODE") @ApiParam(value = "事件原因代码") 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 f681bb6..c5371c6 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_事件处理方法 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "ANDON_事件处理方法") -public class AndonEventMethod extends BaseBean { +public class AndonEventMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2079366249221906256L; @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") 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 43877a3..52cf481 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_事件现象 @@ -29,7 +30,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_事件现象") -public class AndonEventPhenoMenon extends BaseBean { +public class AndonEventPhenoMenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3844606172813258352L; @Column(name = "EPM_CODE") @ApiParam(value = "事件现象代码") 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 95aa421..a7dcae8 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 安灯停线配置数据 @@ -34,7 +35,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonHaltCfg extends BaseBean { +public class AndonHaltCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6209233767460121461L; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") 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 3c89d14..4def408 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 @@ -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 : ANDON_停机类型 @@ -26,7 +27,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON_停机类型") -public class AndonHaltType extends BaseBean { +public class AndonHaltType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7816748747119429173L; @Column(name = "HALT_CODE") @ApiParam(value = "停机类型编码") 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 ff4853d..6213675 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 @@ -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: @@ -26,7 +27,10 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("ANDON知识库") -public class AndonKnowledgeBase extends BaseManageQueue { +public class AndonKnowledgeBase extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = -1636250887271456543L; + @Column(name = "FLOW_STATUS") @ApiParam(value = "审批状态") private Integer flowStatus; 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 f2be38c..e02d1a3 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 @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -41,7 +42,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonManageQueue extends BaseManageQueue { +public class AndonManageQueue extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = 183865984747203897L; + @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; 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 a5d557a..0c285bc 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 安灯记录 @@ -36,7 +37,9 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯记录") -public class AndonManageRecord extends BaseManageQueue { +public class AndonManageRecord extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = 4667499369694353351L; @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") 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 5c81250..59d4a55 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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: 安灯通知记录表 @@ -29,7 +30,10 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("通知记录") -public class AndonMessageRecord extends BaseBean { +public class AndonMessageRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5002185160195696080L; + @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心") private String workCenterCode; 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 e9bbc29..385b069 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 @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : ANDON_PLC控制 @@ -30,7 +31,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯PLC控制") -public class AndonPLC extends BaseBean { +public class AndonPLC extends BaseBean implements Serializable { + + private static final long serialVersionUID = -611094238158756163L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心") 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 33078db..ee4c926 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 @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : ANDON_PLC监控记录 @@ -34,7 +35,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯PLC监控记录") -public class AndonPLCRecord extends BaseBean { +public class AndonPLCRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1593292976397416635L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") 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 31fda6a..cf92a50 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 @@ -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 : 安灯任务附属表 @@ -26,7 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_MANAGE_ATTACH") @Api(value="安灯附属表") -public class AndonQueueAttach extends BaseBean { +public class AndonQueueAttach extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6314624948969141111L; @Column(name="PROD_INFO") @ApiParam(value ="产品信息" , example ="-1") 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 fee0346..2a428d1 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -28,7 +29,9 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("通知方式") -public class AndonResponse extends BaseBean { +public class AndonResponse extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3558849492798328348L; @Column(name = "RESPONSE_CODE") @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") 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 b2ad1a2..7236d3a 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 @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : 安灯通知对象 @@ -28,7 +29,9 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯通知对象") -public class AndonResponseObject extends BaseBean { +public class AndonResponseObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7623038823371770473L; @Column(name = "RP_OBJECT_CODE") @ApiParam(value = "通知对象对象编码") 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 ae42d1b..3316350 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 @@ -16,6 +16,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -32,7 +33,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="MES_AREA") @Api("生产区域") -public class MesArea extends BaseBean { +public class MesArea extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6011431901401687892L; + @Column(name="AREA_CODE") @ApiParam("区域代码") private String areaCode; 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 59d6249..2761fab 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 @@ -17,6 +17,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :生产设备 @@ -32,7 +33,10 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="MES_EQUIPMENT") @Api("生产设备") -public class MesEquipment extends BaseBean { +public class MesEquipment extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4827453020382814751L; + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; 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 533c56a..9098f6b 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="MES_SHIFT") @Api("班次信息") -public class MesShift extends BaseBean { +public class MesShift extends BaseBean implements Serializable { + + private static final long serialVersionUID = -459263592129978101L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") 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 0533141..8bb58e7 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 @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,7 +32,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL") @Api("工作单元") -public class MesWorkCell extends BaseBean { +public class MesWorkCell extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5981041286446162921L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; 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 eb81426..8cf20a2 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 @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,7 +32,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CENTER") @Api("工作中心") -public class MesWorkCenter extends BaseBean { +public class MesWorkCenter extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1988041859547182829L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; 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 6c8ff91..6c046d9 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 @@ -13,7 +13,9 @@ import java.io.Serializable; * @Modify: **/ @Data -public class AndonBoardModel { +public class AndonBoardModel implements Serializable { + + private static final long serialVersionUID = 4995310176494124290L; @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java index 79813f6..06230c4 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -16,7 +17,9 @@ import java.util.List; * @Modify: **/ @Data -public class AndonMenuInterfaceModel{ +public class AndonMenuInterfaceModel implements Serializable { + + private static final long serialVersionUID = 6854130571481363067L; @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java index 5585338..e35260e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java @@ -9,6 +9,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.MappedSuperclass; +import java.io.Serializable; /** * @Description: @@ -19,7 +20,9 @@ import javax.persistence.MappedSuperclass; **/ @Data @MappedSuperclass -public class BaseManageQueue extends BaseBean { +public class BaseManageQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5223610541891941843L; @Column(name = "ANDON_ORDER_NO") @ApiParam(value = "安灯队列编号") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java index 42af00f..217927d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java @@ -12,13 +12,16 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import java.io.Serializable; import java.util.List; /** * 工位分组配置model */ @Data -public class CellGroupStatusModel{ +public class CellGroupStatusModel implements Serializable { + + private static final long serialVersionUID = -6614881484056090725L; @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java index 5df7d8d..d7be692 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Entity; +import java.io.Serializable; /** * @Description: @@ -23,7 +24,9 @@ import javax.persistence.Entity; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("组织模型") -public class ProdOrgModel extends BaseBean { +public class ProdOrgModel extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2210888838877951435L; @ApiParam("区域名称") private String areaName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java index 53e0faf..6f78bda 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java @@ -4,9 +4,12 @@ import cn.estsh.i3plus.pojo.andon.bean.MesArea; import io.swagger.annotations.ApiParam; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; -public class SysOrganizeModel{ +public class SysOrganizeModel implements Serializable { + + private static final long serialVersionUID = -8218859255737680832L; @Transient @ApiParam(value ="父节点") 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 41f39d8..258296d 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 @@ -29,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("作业组件") public class PtlActionModule extends BaseBean implements Serializable { - private static final long serialVersionUID = 4734809867665293289L; + + private static final long serialVersionUID = -4114157018012638259L; @Column(name = "AM_CODE") @ApiParam("组件代码") 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 44fb849..90e4cd7 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("组件集") public class PtlActionModuleGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = 5581772484177493182L; + + private static final long serialVersionUID = 1250324721395561455L; @Column(name = "AMG_ID") @ApiParam("组件集编号") 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 82ba6c0..e3bd0f0 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 @@ -29,7 +29,7 @@ import java.io.Serializable; @Api("组件参数") public class PtlActionModuleParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -1015028092547846989L; + private static final long serialVersionUID = 4579868625998473374L; @Column(name = "AM_CODE") @ApiParam("组件代码") 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 3d2f7f7..eac7e13 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("作业流程") public class PtlActionRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = 6246614708550175795L; + + private static final long serialVersionUID = -8864181068138221051L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") 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 43d20b5..d3bbefe 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("ACTOR信息") public class PtlActor extends BaseBean implements Serializable { - private static final long serialVersionUID = 5647053475810310357L; + + private static final long serialVersionUID = -7339437529064969381L; @Column(name = "ACTOR_CODE") @ApiParam("actor代码") 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 9324978..f8fa5fb 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("ACTOR消息获取规则") public class PtlActorRule extends BaseBean implements Serializable { - private static final long serialVersionUID = -1515292442151992142L; + + private static final long serialVersionUID = -963692719400754670L; @Column(name = "ACTOR_CODE") @ApiParam("actor代码") 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 2a779bc..05de822 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 @@ -31,7 +31,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Api("区域") public class PtlArea extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443841199197995L; + + private static final long serialVersionUID = 2112712129904360675L; @Column(name = "AREA_NO") @ApiParam("区域代码") 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 cae88c8..caf5c46 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_区域观察者事件配置") public class PtlAreaActorAction extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596837642283797995L; + + private static final long serialVersionUID = -7531797997172228131L; @Column(name = "AREA_NO") @ApiParam("区域代码") 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 9672b1d..c5a58e1 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 @@ -29,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区域作业流程") public class PtlAreaRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = -9139851888717990905L; + + private static final long serialVersionUID = 2190158227924727752L; @Column(name = "AREA_NO") @ApiParam("区域代码") 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 14bc428..34c5e42 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_区域流程组件调用参数") public class PtlAreaRouteModuleParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596829442283797995L; + + private static final long serialVersionUID = -3322697230578335377L; @Column(name = "AREA_NO") @ApiParam("区域代码") 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 eec1146..8bed06c 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 @@ -30,7 +30,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Api("区段亮灯任务") public class PtlAreaSectionTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 1453616567666404664L; + + private static final long serialVersionUID = 3594963385331020252L; @Column(name = "SECTION_TASK_NO") @ApiParam("区段任务编号") 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 1d04433..3e14e31 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区段亮灯任务明细") public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -7563431552643393714L; + + private static final long serialVersionUID = 2881889608152445629L; @Column(name = "SECTION_TASK_NO") @ApiParam("区段任务编号") 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 b07a2d9..2df3ce2 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 @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区域亮灯任务") public class PtlAreaTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 1188465976922660834L; + + private static final long serialVersionUID = -3984445969125341848L; @Column(name = "AREA_TASK_NO") @ApiParam("区域任务编号") 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 5570ddc..b8a8825 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 @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区域任务进度") public class PtlAreaTaskSeq extends BaseBean implements Serializable { - private static final long serialVersionUID = 7138688457410728493L; + + private static final long serialVersionUID = 8346059210789998285L; @Column(name = "AREA_NO") @ApiParam("区域代码") 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 6c72b19..972e412 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 @@ -25,7 +25,8 @@ import java.io.Serializable; @Table(name = "PTL_BOM") @EqualsAndHashCode(callSuper = true) public class PtlBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -4459081803170156825L; + + private static final long serialVersionUID = 2676195473413945030L; @Column(name = "PART_NO") @ApiParam("父物料号") 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 16faab6..fce2d11 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 @@ -29,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("控制器") public class PtlControl extends BaseBean implements Serializable { - private static final long serialVersionUID = -5371842196308816310L; + + private static final long serialVersionUID = 3118824964768156554L; @Column(name = "CONTROL_NO") @ApiParam("控制器编号") 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 f11b596..de26af7 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("元素") public class PtlElement extends BaseBean implements Serializable { - private static final long serialVersionUID = 5562337056340313246L; + + private static final long serialVersionUID = 65129699912359054L; @Column(name = "ELEMENT_NO") @ApiParam("元素代码") 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 30025bc..5763636 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("元素属性") public class PtlElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = 4591354414381724731L; + + private static final long serialVersionUID = -4734327563828184066L; @Column(name = "ELEMENT_NO") @ApiParam("元素代码") 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 c066a91..ab70950 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_接口清单") public class PtlIf extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596882732758197995L; + + private static final long serialVersionUID = 8056691337038646866L; @Column(name = "IF_CODE") @ApiParam("接口代码") 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 a74cab7..8bde78c 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("界面") public class PtlInterface extends BaseBean implements Serializable { - private static final long serialVersionUID = 5905965593463421411L; + + private static final long serialVersionUID = -380212716030440434L; @Column(name = "INTERFACE_NO") @ApiParam("界面代码") 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 56c2b50..6412bb4 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("界面元素") public class PtlInterfaceElement extends BaseBean implements Serializable { - private static final long serialVersionUID = -8436630151033411240L; + + private static final long serialVersionUID = 1583442966822428784L; @Column(name = "INTERFACE_NO") @ApiParam("界面代码") 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 445b8f2..8a7c756 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 @@ -26,7 +26,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("界面元素属性") public class PtlInterfaceElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = 6603839514256277172L; + + private static final long serialVersionUID = -6093597374268730218L; @Column(name = "INTERFACE_NO") @ApiParam("界面代码") 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 a14a5a3..eb3e19d 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 @@ -29,6 +29,7 @@ import java.util.List; public class PtlLabelTemplate extends BaseBean implements Serializable { private static final long serialVersionUID = 8287307324960885418L; + @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; 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 08a100e..de2c8ac 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 @@ -30,6 +30,7 @@ import java.io.Serializable; public class PtlLabelTemplateParam extends BaseBean implements Serializable { private static final long serialVersionUID = 7292367173575992422L; + @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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 05b54f6..6733022 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 @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("主任务") public class PtlMainTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 7144785793974319891L; + + private static final long serialVersionUID = 8626414623799663395L; @Column(name = "TASK_NO") @ApiParam("主任务编号") 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 a0eb09b..d273e3e 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 @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("主任务明细") public class PtlMainTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 7144785793974319897L; + + private static final long serialVersionUID = -7380963913791704644L; @Column(name = "TASK_NO") @ApiParam("主任务编号") 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 70d99c0..cdf49e6 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("消息类型") public class PtlMessageType extends BaseBean implements Serializable { - private static final long serialVersionUID = -8899362292879155612L; + + private static final long serialVersionUID = -1202110531150781349L; @Column(name = "MT_CODE") @ApiParam("消息类型代码") 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 6339bca..3b9f24f 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("消息类型格式") public class PtlMessageTypeFormat extends BaseBean implements Serializable { - private static final long serialVersionUID = 3398977445081168030L; + + private static final long serialVersionUID = 1114241840945889678L; @Column(name = "MT_CODE") @ApiParam("消息类型代码") 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 d86d1b1..982dcef 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 @@ -29,7 +29,9 @@ import java.io.Serializable; @Table(name = "PTL_OBJECT_DAO") @Api("PTL_对象与dao对应关系") public class PtlObjectDao extends BaseBean implements Serializable { - private static final long serialVersionUID = 2286752328499060L; + + private static final long serialVersionUID = 3972627525439997959L; + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; 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 6508012..16331af 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 @@ -27,7 +27,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("物料") public class PtlPart extends BaseBean implements Serializable { - private static final long serialVersionUID = -7451758045686558893L; + + private static final long serialVersionUID = -517621136983016210L; @Column(name = "PART_NO") @ApiParam("物料编号") 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 b9e661b..b822a40 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 @@ -28,7 +28,9 @@ import java.io.Serializable; @Table(name = "PTL_PCN") @Api("PCN节点") public class PtlPcn extends BaseBean implements Serializable { - private static final long serialVersionUID = -9140094723555406392L; + + private static final long serialVersionUID = -4320051898730968719L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; 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 360d748..f7001d4 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 @@ -29,7 +29,8 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Api("PTL_PCN数据清理") public class PtlPcnClear extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443273899197995L; + + private static final long serialVersionUID = 2581206839565766798L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") 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 05d5c88..e966b3e 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @Table(name = "PTL_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class PtlPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = 2756240593256441951L; + + private static final long serialVersionUID = 7670515108162521936L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") 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 060404d..18a7d10 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 @@ -31,7 +31,7 @@ import java.io.Serializable; @Api("PTL_PCN_同步配置") public class PtlPcnSyncCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7270948230576127126L; + private static final long serialVersionUID = -5459970792389134485L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") 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 110f4a8..486b07c 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 @@ -31,6 +31,7 @@ import java.io.Serializable; public class PtlPcnSyncErrorLog extends BaseBean implements Serializable { private static final long serialVersionUID = -8285936568677939604L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; 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 916a9ce..3f67269 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 @@ -29,7 +29,8 @@ import java.io.Serializable; @Table(name = "PTL_PCN_TASK") @Api("ptl-pcn定时任务工作清单") public class PtlPcnTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 4129714382965409395L; + + private static final long serialVersionUID = 2486815585819368941L; @Column(name = "TASK_CODE") @ApiParam("任务代码") 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 f10f0e0..58d21b7 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 @@ -29,7 +29,8 @@ import java.io.Serializable; @Table(name = "PTL_PCN_TASK_LOG") @Api("ptl-pcn定时任务工作清单同步记录") public class PtlPcnTaskLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -784806174962540310L; + + private static final long serialVersionUID = 932305261648065821L; @Column(name = "SYNC_TIME_START") @ApiParam("同步数据开始时间") 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 8d6bb6b..4bfd0b9 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 @@ -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 : 打印机配置表 @@ -26,9 +27,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="PTL_PRINTER_CONFIGURE") @Api("打印机配置表") -public class PtlPrinterConfigure extends BaseBean{ +public class PtlPrinterConfigure extends BaseBean implements Serializable { + + private static final long serialVersionUID = -226395857300082832L; - private static final long serialVersionUID = 1234639813072592779L; @Column(name="PRINTER_NO") @ApiParam("打印机编号") private String printerNo; 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 1d4cb38..22f7119 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 @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : 待打印队列表 @@ -27,9 +28,10 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="PTL_PRINTING_QUEUE") @Api("待打印队列表") -public class PtlPrintingQueue extends BaseBean{ +public class PtlPrintingQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 729384890593058720L; - private static final long serialVersionUID = 1111639813072592779L; @Column(name="PRINT_IDENTIFICATION") @ApiParam("打印标识") private String printIdentification; 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 2194d12..6c57df7 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("PTL_RFID") public class PtlRfid extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596837642758197995L; + + private static final long serialVersionUID = 1322725195212837292L; @Column(name = "RFID_CONTROL_NO") @ApiParam("RFID读写器代码") 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 56fdace..9d7dce2 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 @@ -29,7 +29,7 @@ import java.io.Serializable; @Api("PTL_流程组件调用参数") public class PtlRouteModuleParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -3036415977457877114L; + private static final long serialVersionUID = -7330592964296954653L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") 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 6222e0a..77999b7 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("流程状态") public class PtlRouteStatus extends BaseBean implements Serializable { - private static final long serialVersionUID = -2862693366302428501L; + + private static final long serialVersionUID = 5555766204635105977L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") 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 3935303..0faefbd 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 @@ -29,7 +29,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区段") public class PtlSection extends BaseBean implements Serializable { - private static final long serialVersionUID = -7451758045686558883L; + + private static final long serialVersionUID = -1155737119433934849L; @Column(name = "SECTION_NO") @ApiParam("区段编号") 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 0de2878..b504674 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 @@ -28,7 +28,8 @@ import java.io.Serializable; }) @Api("数据同步死信") public class PtlSyncDeadLetter extends BaseBean implements Serializable { - private static final long serialVersionUID = 1151025992437433734L; + + private static final long serialVersionUID = -7435143562440979065L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") 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 8c46173..a897694 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 @@ -28,7 +28,8 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("标签信息") public class PtlTag extends BaseBean implements Serializable { - private static final long serialVersionUID = -949910394508157581L; + + private static final long serialVersionUID = -2431773668822112292L; @Column(name = "TAG_NO") @ApiParam("标签代码") 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 5f056b7..0f63c84 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : @@ -28,11 +29,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="PTL_TEST_USER") @Api(value="PTL 测试用户",description = "测试用户") -public class PtlTestUser extends BaseBean { +public class PtlTestUser extends BaseBean implements Serializable { private static final long serialVersionUID = -130240511327784335L; - @Column(name="USER_INFO_ID") @ApiParam(value ="人员ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java index f08d7da..fc36a47 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java @@ -20,7 +20,7 @@ import java.util.List; @Api("流程明细Model") public class ActionModuleGroupModel implements Serializable { - private static final long serialVersionUID = 3569055511035396175L; + private static final long serialVersionUID = 3963042613552364928L; @ApiParam("组件代码") private String amCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java index e2a1467..41eadd0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @author Wynne.Lu * @date 2020/2/12 18:18 @@ -11,7 +13,9 @@ import lombok.Data; */ @Data @ApiModel("作业组件model") -public class ActionModuleModel { +public class ActionModuleModel implements Serializable { + + private static final long serialVersionUID = 4925369056448110395L; @ApiModelProperty("组件代码") private String amCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java index 3a1e7fe..cda9485 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import java.io.Serializable; + /** * @author Wynne.Lu * @date 2020/2/13 19:31 @@ -17,7 +19,9 @@ import lombok.ToString; @NoArgsConstructor @ToString @ApiModel("actor消息类型及属性") -public class ActorMessageModel { +public class ActorMessageModel implements Serializable { + + private static final long serialVersionUID = 4524576023835016971L; @ApiModelProperty("消息类型代码") private String mtCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java index cd3cec6..ed49267 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -19,7 +21,9 @@ import lombok.ToString; @NoArgsConstructor @ToString @ApiModel("actor消息类型及属性") -public class AreaSectionTaskDetailModel { +public class AreaSectionTaskDetailModel implements Serializable { + + private static final long serialVersionUID = -896587708527024227L; private Long id; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java index 1cb36c9..e23dfcf 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java @@ -7,7 +7,8 @@ import java.io.Serializable; @Data public class AttrModel implements Serializable { - private static final long serialVersionUID = -4842958192243396773L; + + private static final long serialVersionUID = 7259890069511744335L; @ApiParam("属性名称") private String attrName; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java index e533406..c4c0900 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java @@ -18,7 +18,7 @@ import java.util.List; @Api("作业流程Model") public class BussinessProcessModel implements Serializable { - private static final long serialVersionUID = 148029163662900001L; + private static final long serialVersionUID = 1987194216369839465L; @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index 13576e2..a379b44 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -19,7 +19,8 @@ import java.util.Map; @Data @ApiModel("通用数据传输对象") public class CommonMsgModel implements Serializable { - private static final long serialVersionUID = 6359899762200319607L; + + private static final long serialVersionUID = 8271636435115494111L; @ApiModelProperty("工厂") private String organizeCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index f423f60..92d0c0d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -15,7 +15,8 @@ import java.io.Serializable; @Data @ApiModel("亮灯model") public class LightOnModel implements Serializable { - private static final long serialVersionUID = -1089361557513425229L; + + private static final long serialVersionUID = 2054373260210137133L; @ApiParam("标签地址，范围1~250,设置null即为所有标签") private Integer tagNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java index 167a62d..70bc3cc 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java @@ -17,7 +17,7 @@ import java.io.Serializable; @ApiModel("生产队列主表") public class MesQueueOrder implements Serializable { - private static final long serialVersionUID = -3124113504001270712L; + private static final long serialVersionUID = -3191808970468979533L; @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java index 48d66be..b92295c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java @@ -17,7 +17,7 @@ import java.io.Serializable; @ApiModel("生产队列明细") public class MesQueueOrderDetail implements Serializable { - private static final long serialVersionUID = 1945173626511595078L; + private static final long serialVersionUID = 806856745031040789L; @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java index fdfb332..444f867 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java @@ -18,7 +18,7 @@ import java.io.Serializable; @ApiModel("工位物料清单") public class MesStationBom implements Serializable { - private static final long serialVersionUID = -2658812944873600461L; + private static final long serialVersionUID = 7398825718819106180L; @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java index 3f42664..916995e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java @@ -19,7 +19,7 @@ import java.util.Map; @Api("流程明细Model") public class ProcessDetailModel implements Serializable { - private static final long serialVersionUID = 3569055511035396175L; + private static final long serialVersionUID = 4353961796870951797L; @ApiParam("状态代码") private String statusCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java index c4bbcd4..f56a32a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java @@ -7,11 +7,15 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + @Data @NoArgsConstructor @AllArgsConstructor @Api("产品包装model") -public class ProductDataModel { +public class ProductDataModel implements Serializable { + + private static final long serialVersionUID = 6946629608590823479L; @ApiParam("字段代码") private String fieldCode; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java index 28b0ed1..5f5d0d4 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java @@ -19,6 +19,8 @@ import java.util.List; @Api("亮灯监听Model") public class PtlMonitorControlModel implements Serializable { + private static final long serialVersionUID = 7446249296664249977L; + @ApiParam("刷新频率") public String refreshTime; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java index 4e83d86..4d89870 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java @@ -17,7 +17,8 @@ import java.util.Map; @Data @ApiModel("特定条件model") public class SpecificRuleModel implements Serializable { - private static final long serialVersionUID = -4724747574943605500L; + + private static final long serialVersionUID = 7948646696191723363L; private List kList=new ArrayList<>(); diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java index 030a1d9..2f486c0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java @@ -19,6 +19,8 @@ import java.util.Map; @Data public class WsResultBean implements Serializable { + private static final long serialVersionUID = 7807441951231474373L; + /** * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 * moduleContent组件内容,taskComplete整个扫描完成 From 029763feb1c8b5eac914151ec7447c95b0046307 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 14 May 2020 19:10:02 +0800 Subject: [PATCH 131/134] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 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 a9e288f..b948580 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 a44418c..e12eaee 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 2de88b5..c338f71 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 50ab2c2..7637865 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 7f94617..d98b7d8 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 60fc467..a758a6a 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 d65e031..efacfd2 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 a785f21..dba12cc 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 d6d2f8e..81670b2 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 0fbfb69..26a7311 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 76739f9..eaf2544 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 0368700..0f615b6 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 b2eedd4..9e5f745 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 5fcd08a..0fea52b 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 2eddf76..cc8fce6 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 ec7718294451274569e7fe4015efb200fe13b1ac Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 14 May 2020 19:11:03 +0800 Subject: [PATCH 132/134] =?UTF-8?q?=E3=80=90BATCH=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=80=BC-=E6=9F=A5=E8=AF=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 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 55dd8fd..5c2dd6d 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 @@ -3168,7 +3168,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result); - DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkResult(), "reworkStatus", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkStatus(), "reworkStatus", result); DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result); if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) { DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(), From 60dee0420670b132f7841c1813968563cc76c33c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 14 May 2020 19:12:24 +0800 Subject: [PATCH 133/134] =?UTF-8?q?=E3=80=908512=20=E4=B8=AD=E8=88=AA-BH?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=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/wms/bean/WmsStockSn.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/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 3be68de..2698900 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 @@ -570,7 +570,7 @@ public class WmsStockSn extends BaseBean { public WmsStockSn(String organizeCode, String refSrc, String partNo, String partNameRdd, Integer snType, String locateNo, String workCenterCode, String packageNo, String shippingFlag, String lotNo, String dateCode, String fixLotNo - , String leftCode, Double qty, String sn, String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + , String leftCode, Double qty, String sn, String createUser, String createDatetime,String modifyUser,String modifyDatetime) { this.organizeCode = organizeCode; this.refSrc = refSrc; this.partNo = partNo; From 5004f1703777313aa3d004913e23f17ffd0b4803 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 14 May 2020 19:53:03 +0800 Subject: [PATCH 134/134] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mdm/pom.xml | 2 +- sonar-project.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..b1911ec 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/sonar-project.properties b/sonar-project.properties index 932bdd9..3428e74 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=./