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 1/4] =?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 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 2/4] =?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 3/4] =?UTF-8?q?=E3=80=901722=20BH-Bacth=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=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 2b01efb15b184ab6206f11536786e538c3a3709c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 25 Apr 2020 17:45:01 +0800 Subject: [PATCH 4/4] =?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; }