From 3b47469aad37e7fe082f7f7ebc47add57bf83bdc Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 17 Apr 2019 14:19:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BDModel?= =?UTF-8?q?=20=E5=B0=81=E8=A3=85=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/form/FormModel.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 b9ea7ae..08b4fd5 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.form; +import cn.estsh.i3plus.pojo.form.bean.BfButton; import cn.estsh.i3plus.pojo.form.bean.BfLayout; import cn.estsh.i3plus.pojo.form.bean.BfMethod; import cn.estsh.i3plus.pojo.form.bean.BfMethodDetail; @@ -33,6 +34,18 @@ public class FormModel { @ApiParam(value = "功能布局") private BfLayout layout; + // 表单功能按钮 + @ApiParam(value = "表单功能按钮") + private List formButtonList; + + // 表单功能明细按钮 + @ApiParam(value = "表单功能明细按钮") + private List methodDetailButtonList; + + // 元素功能按钮 + @ApiParam(value = "元素功能按钮") + private List elementButtonList; + // 功能明细 @ApiParam(value = "功能明细") private List methodDetailList; @@ -40,4 +53,5 @@ public class FormModel { // 元素 @ApiParam(value = "元素Model") private List elementModelList; + } From d08b12e1d7d4c57ee24011dd92ab36ad267f36c7 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 17 Apr 2019 14:44:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Mes=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=BF=94=E5=9B=9E=E4=B8=BA=E7=A9=BA=E7=9A=84get?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesAction.java | 4 +++ .../i3plus/pojo/mes/bean/MesActionMethod.java | 5 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 12 +++++++-- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 14 ++++++---- .../cn/estsh/i3plus/pojo/mes/bean/MesEvent.java | 4 +++ .../estsh/i3plus/pojo/mes/bean/MesEventAction.java | 6 +++++ .../cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java | 8 ++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 20 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 4 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 12 +++++++++ .../i3plus/pojo/mes/bean/MesPartScheduleBom.java | 4 +++ .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 16 ++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesProcessBom.java | 12 +++++++++ .../i3plus/pojo/mes/bean/MesProdCfgDetail.java | 4 +++ .../i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 8 ++++++ .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 20 +++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 14 +++++++--- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 16 ++++++++++-- .../i3plus/pojo/mes/bean/MesRouteProcess.java | 8 ++++++ .../i3plus/pojo/mes/bean/MesRouteProcessStep.java | 4 +++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 30 +++++++++++++++++++++- 21 files changed, 212 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java index 4517562..a804e6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java @@ -39,4 +39,8 @@ public class MesAction extends BaseBean { @Column(name="ACTION_TYPE") @ApiParam("动作类型") private Integer actionType; + + public int getActionTypeVal() { + return this.actionType == null ? 0 : this.actionType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java index d425bd5..ee779bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java @@ -39,4 +39,9 @@ public class MesActionMethod extends BaseBean { @Column(name="SEQ") @ApiParam("序号") private Integer seq; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index f9c9ab6..d6ba7b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -72,10 +72,18 @@ public class MesBom extends BaseBean { @Column(name = "EFF_START_TIME") @ApiParam(value = "生效时间") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date effStartTime; + private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam(value = "失效时间") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date effEndTime; + private String effEndTime; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getitemQtyVal() { + return this.itemQty == null ? 0.0d : this.itemQty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 33f42cd..9500bb0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -34,7 +34,7 @@ public class MesDefectRecord extends BaseBean { @Column(name="PART_NO") @ApiParam("物料号") - private Integer partNo; + private String partNo; @Column(name="DEFECT_CODE") @ApiParam("不良代码") @@ -42,17 +42,21 @@ public class MesDefectRecord extends BaseBean { @Column(name="REPAIR_STATUS") @ApiParam("维修状态") - private Double repairStatus; + private Integer repairStatus; @Column(name="WORK_CENTER_CODE") @ApiParam("工作中心代码") - private Double workCenterCode; + private String workCenterCode; @Column(name="WORK_CELL_CODE") @ApiParam("工作单元代码") - private Double workCellCode; + private String workCellCode; @Column(name="MEMO") @ApiParam("备注") - private Double memo; + private String memo; + + public int getRepairStatusVal() { + return this.repairStatus == null ? 0 : this.repairStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java index d45fb6d..c442bb9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -39,4 +39,8 @@ public class MesEvent extends BaseBean { @Column(name="EVENT_TYPE") @ApiParam("事件类型") private Integer eventType; + + public int getEventTypeVal() { + return this.eventType == null ? 0 : this.eventType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java index 5b559df..0146041 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java @@ -39,4 +39,10 @@ public class MesEventAction extends BaseBean { @Column(name="SEQ") @ApiParam("序号") private Integer seq; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index a0da095..37112eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -42,4 +42,12 @@ public class MesKeyData extends BaseBean { @Column(name="LOWER_LIMIT") @ApiParam("数据下限") private Double lowerLimit; + + public double getUpperLimitVal() { + return this.upperLimit == null ? 0.0d : this.upperLimit; + } + + public double getLowerLimitVal() { + return this.lowerLimit == null ? 0.0d : this.lowerLimit; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java index f1bca85..1fa961f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java @@ -70,4 +70,24 @@ public class MesKpsnRule extends BaseBean { @Column(name="SUPPLIER_CODE") @ApiParam("供应商代码") private String supplierCode; + + public int getLengthVal() { + return this.length == null ? 0 : this.length; + } + + public int getFrom1Val() { + return this.from1 == null ? 0 : this.from1; + } + + public int getTo1Val() { + return this.to1 == null ? 0 : this.to1; + } + + public int getFrom2Val() { + return this.from2 == null ? 0 : this.from2; + } + + public int getTo2Val() { + return this.to2 == null ? 0 : this.to2; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index ef34e81..be70ae3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -43,4 +43,8 @@ public class MesMethod extends BaseBean { @Column(name="METHOD_TYPE") @ApiParam("方法类型") private Integer methodType; + + public int getMethodTypeVal() { + return this.methodType == null ? 0 : this.methodType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index 5afdee5..413a5ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -53,4 +53,16 @@ public class MesPackSpec extends BaseBean { @Column(name="SPEC_LEVEL") @ApiParam("规格级别") private Integer specLevel; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getIsMixedVal() { + return this.isMixed == null ? 0 : this.isMixed; + } + + public int getSpecLevelVal() { + return this.specLevel == null ? 0 : this.specLevel; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index 8097a97..fa81998 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -42,4 +42,8 @@ public class MesPartScheduleBom extends BaseBean { @Column(name="SCHEDULE_TYPE") @ApiParam("排程类型") private Double scheduleType; + + public double getScheduletTypeVal() { + return this.scheduleType == null ? 0.0d : this.scheduleType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 6b904e0..e02cf88 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -82,4 +82,20 @@ public class MesPlanOrder extends BaseBean { @Column(name="MEMO") @ApiParam("备注") private String memo; + + public double getPlanQtyVal() { + return this.planQty == null ? 0.0d : this.planQty; + } + + public double getDecomposeQtyVal() { + return this.decomposeQty == null ? 0.0d : this.decomposeQty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public int getOrderTypeVal() { + return this.orderType == null ? 0 : this.orderType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index 6c0e8ea..757da5a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -55,4 +55,16 @@ public class MesProcessBom extends BaseBean { @Column(name = "IS_CHECK") @ApiParam(value = "是否检查") private Integer isCheck; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getIsRepeatVal() { + return this.isRepeat == null ? 0 : this.isRepeat; + } + + public int getIsCheckVal() { + return this.isCheck == null ? 0 : this.isCheck; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index cc76c0c..5ed96a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -39,4 +39,8 @@ public class MesProdCfgDetail extends BaseBean { @Column(name="IS_VIRTUAL") @ApiParam("是否虚零件") private Integer isVirtual; + + public int getIsVirtualVal() { + return this.isVirtual == null ? 0 : this.isVirtual; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 8056e07..d3a8239 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -54,4 +54,12 @@ public class MesProdRouteOptParam extends BaseBean { @Column(name = "PARAM_VALUE") @ApiParam("工步参数值") private String paramValue; + + public long getProdRouteCfgIdVal() { + return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId; + } + + public int getStepSeq() { + return this.stepSeq == null ? 0 : this.stepSeq; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 6c4e672..2a7b1bd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -103,4 +103,24 @@ public class MesProduceSn extends BaseBean { @Column(name="PACKAGE_SN") @ApiParam("包装条码") private String packageSn; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getQcStatusVal() { + return this.qcStatus == null ? 0 : this.qcStatus; + } + + public int getSnStatusVal() { + return this.snStatus == null ? 0 : this.snStatus; + } + + public int getPrintCountVal() { + return this.printCount == null ? 0 : this.printCount; + } + + public int getPrintStatusVal() { + return this.printStatus == null ? 0 : this.printStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 6370818..772cbbb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -45,7 +45,7 @@ public class MesQueueOrder extends BaseBean { @Column(name="WORK_ORDER_NO") @ApiParam("生产工单号") - private Double workOrderNo; + private String workOrderNo; @Column(name="STATUS") @ApiParam("状态") @@ -53,9 +53,17 @@ public class MesQueueOrder extends BaseBean { @Column(name="CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") - private Double custProdLineCode; + private String custProdLineCode; @Column(name="AREA_CODE") @ApiParam("区域代码") - private Double areaCode; + private String areaCode; + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public double getSeq() { + return this.seq == null ? 0.0d : this.seq; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index f4c182e..a2a12af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -53,9 +53,21 @@ public class MesQueueOrderDetail extends BaseBean { @Column(name="WORK_TYPE") @ApiParam("生产类型") - private Double workType; + private String workType; @Column(name="PRODUCE_CATEGORY") @ApiParam("产品类型") - private Double produceCategory; + private String produceCategory; + + public double getDetailSeqVal() { + return this.detailSeq == null ? 0.0d : this.detailSeq; + } + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index 0434ff5..2f84f21 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -50,4 +50,12 @@ public class MesRouteProcess extends BaseBean { @Column(name = "IS_NECESSARY") @ApiParam("是否必须") private Integer isNecessary; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + public int getIsNecessaryVal() { + return this.isNecessary == null ? 0 : this.isNecessary; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java index b75e800..7b328f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java @@ -50,4 +50,8 @@ public class MesRouteProcessStep extends BaseBean { @Column(name = "PARAM_VALUE") @ApiParam("工步参数值") private String paramValue; + + public int getStepSeqVal() { + return this.stepSeq == null ? 0 : this.stepSeq; + } } 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 fd29d30..11fe2b1 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 @@ -33,7 +33,7 @@ public class MesWorkOrder extends BaseBean { @Column(name="PART_NO") @ApiParam("物料号") - private Integer partNo; + private String partNo; @Column(name="PROD_CFG_CODE") @ApiParam("产品配置代码") @@ -110,4 +110,32 @@ public class MesWorkOrder extends BaseBean { @Column(name="MEMO") @ApiParam("备注") private String memo; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getCompleteQtyVal() { + return this.completeQty == null ? 0.0d : this.completeQty; + } + + public double getRepairQtyVal() { + return this.repairQty == null ? 0.0d : this.repairQty; + } + + public double getScrapQtyVal() { + return this.scrapQty == null ? 0.0d : this.scrapQty; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public int getWorkOrderStatusVal() { + return this.workOrderStatus == null ? 0 : this.workOrderStatus; + } + + public int getWorkOrderTypeVal() { + return this.workOrderType == null ? 0 : this.workOrderType; + } }