From de6792426e80b95f431e6cddcacc6a0d29609c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Sep 2019 20:57:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E5=8D=95=E6=8D=AE=E5=AE=8C=E6=88=90=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=BE=85=E6=8F=90=E4=BA=A4=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=EF=BC=9B=E5=8F=AA=E6=8E=A8=E9=80=81=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=20PDA=E6=94=B6=E8=B4=A7=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=9A=E6=94=B9=E6=95=B0=E5=90=8E=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 19 +++++++++++-------- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 16 ++++++++-------- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 14 +++++++++----- 4 files changed, 32 insertions(+), 21 deletions(-) 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 2fb7868..64ea546 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 @@ -43,7 +43,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer asnStatus; @Column(name = "VENDOR_NO") @@ -68,7 +68,7 @@ public class WmsASNMaster extends BaseBean { @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; @ApiParam("ASN详情列表") @@ -169,18 +169,19 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("收货状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class, refForeignKey = "value", value = "description") private String recStatus; @Transient @ApiParam("项目") private String prodCfgTypeCode; - public WmsASNMaster(){} + public WmsASNMaster() { + } - public WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd, - Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType, - String recStatus){ + public WmsASNMaster(String orderNo, Integer asnStatus, String vendorNo, String partNo, String partNameRdd, + Double sumQty, Double sumRecQty, String planDate, String planTime, Double diffQty, String orderType, + String recStatus) { this.orderNo = orderNo; this.asnStatus = asnStatus; @@ -196,5 +197,7 @@ public class WmsASNMaster extends BaseBean { this.recStatus = recStatus; } - + public int getAsnStatusVal() { + return this.asnStatus == null ? 0 : this.asnStatus; + } } 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 49f0d92..fa09e20 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 @@ -45,7 +45,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "MOVE_TYPE") @ApiParam("移动类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description") public Integer moveType; /** * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, @@ -54,7 +54,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "BUSI_TYPE") @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") public Integer busiType; /** @@ -63,7 +63,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer orderStatus; @Column(name = "CUST_NO") @@ -95,7 +95,7 @@ public class WmsDocMovementMaster extends BaseBean { @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 = "PRIORITY") @@ -123,7 +123,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "IS_PART") @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") private Integer isPart; @Column(name = "SRC_WH_NO") @@ -162,7 +162,7 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("类型名称") public String busiTypeName; -// public Integer getIsSn() { -//// return isSn == null ? 0 : this.getIsSn(); -//// } + public int getOrderStatusVal() { + return this.orderStatus == null ? 0 : this.orderStatus; + } } 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 a8c4c5e..a545be8 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 @@ -140,4 +140,8 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("前端信息") private String message; + + 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/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index ffe25ee..7d79a3b 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 @@ -42,7 +42,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") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description") public Integer orderType; /** @@ -50,7 +50,7 @@ public class WmsQCMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer orderStatus; @Column(name = "REMARK") @@ -87,11 +87,15 @@ public class WmsQCMaster extends BaseBean { @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") + @Column(name = "IS_PART") @ApiParam(value = "是否散件", example = "2") - @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; + + public int getOrderStatusVal() { + return this.orderStatus == null ? 0 : this.orderStatus; + } } From 70868503d463fb3a7bf91c434e580f1395df16cd Mon Sep 17 00:00:00 2001 From: "jason.niu" Date: Tue, 17 Sep 2019 11:24:27 +0800 Subject: [PATCH 2/3] add beans services controllers to aps --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/Calendar.java | 4 --- .../estsh/i3plus/pojo/aps/bean/CancelPlanRule.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 7 +++++ .../estsh/i3plus/pojo/aps/bean/FieldSetRule.java | 7 +++++ .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 7 +++++ .../estsh/i3plus/pojo/aps/bean/OperResource.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 7 +++++ .../i3plus/pojo/aps/bean/OvertimeCalendar.java | 11 ++++++++ .../estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 7 +++++ .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 7 +++++ .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 7 +++++ .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 7 +++++ .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 7 +++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 7 +++++ .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 7 +++++ .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 7 +++++ .../cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java | 30 +++++++++++----------- .../cn/estsh/i3plus/pojo/aps/model/EnumModel.java | 9 +++++++ 32 files changed, 231 insertions(+), 19 deletions(-) delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Calendar.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 7926bb7..c0e8de4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :订单基类 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BaseOrder extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index 5660f01..4c22dbe 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :规则基类 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BaseRule extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Calendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Calendar.java deleted file mode 100644 index 0f5503f..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Calendar.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.bean; - -public class Calendar extends BaseAPS { -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java index 2bd178d..a25a9dd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :取消计划规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class CancelPlanRule extends BaseRule { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index 73f0b4d..493645b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :班次 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class DayShift extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index c28267a..e1d30f2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :字段赋值规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class FieldSetRule extends BaseRule { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 0fb9a5b..b343f3d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :排程运算规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class HeuristicRule extends BaseRule { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index cbfbfcd..b4a4361 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :库存 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class Inventory extends BaseOrder { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index 03b5f34..cb97d5e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :物料运算规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class MatCalcRule extends BaseRule { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 4f8906d..352542e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -10,6 +10,13 @@ import javax.persistence.Column; import javax.persistence.MappedSuperclass; import javax.persistence.Table; +/** + * @Description :物料 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Data @MappedSuperclass @Table(name = "MATERIAL") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 3e12e13..bc87257 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工序输入 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class OperInput extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 4ed7489..f32f43b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工序输出 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class OperOutput extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 49e975d..233987a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工序资源 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class OperResource extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index b53c355..b30e1da 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工序 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class Operation extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java new file mode 100644 index 0000000..1a68f40 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +/** + * @Description :加班日历 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public class OvertimeCalendar extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 8af6984..c02f251 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :计划反馈 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class PlanFeedback extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index c0e4078..36dae88 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :生产订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class ProductOrder extends BaseOrder { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index bc019d8..c67d4ed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工艺路线 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class ProductRouting extends BaseCode { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index 566052a..81ab2fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :采购订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class PurchaseOrder extends BaseOrder { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index f2556f6..f54a7c8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :日历 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class ResCalendar extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index f2b8481..32695fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :资源 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class Resource extends BaseCode { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 96988ae..3fa2af6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :规则组合 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class RuleGroup extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 070c7d2..752d85f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :销售订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class SalesOrder extends BaseOrder { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 05ade23..d8f98ea 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description : 标准工序 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class StandOperation extends BaseCode { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index f188fb9..c028805 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :系统参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class SysParam extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 6a5efd0..4067d7b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工作 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class Work extends BaseCode { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 0094be2..676f9a8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工作输入 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class WorkInput extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 21d5f16..09e27c9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工作输出 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class WorkOutput extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index e2d3495..8efb888 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工作关联 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class WorkRelation extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 69b1675..6ca39be 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +/** + * @Description :工作资源 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class WorkResource extends BaseAPS { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java index 24099d8..29f7f19 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java @@ -2,19 +2,19 @@ package cn.estsh.i3plus.pojo.aps.enums; public enum FIELD_TYPE { NONE, - BOOLEAN, - CHAR, - SHORT, - INTEGER, - LONG, - DOUBLE, - DATE, - TIME, - DATETIME, - DURATION, - ENUM, - MULTIENUM, - STRING, - OBJECT, - LIST + BOOLEAN, // 布尔 + CHAR, // 字符 + SHORT, // 短整型 + INTEGER, // 整型 + LONG, // 长整型 + DOUBLE, // 浮点型 + DATE, // 日期类型(2019-09-16) + TIME, // 时间类型(17:35:30) + DATETIME, // 日期时间类型(2019-09-16 17:35:30) + DURATION, // 时间段(1H) + ENUM, // 枚举 + MULTIENUM, // 多选枚举 + STRING, // 字符串 + OBJECT, // 关联对象，下来选择关联对象的Code值 + LIST // 对象集合，不可编辑。 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java new file mode 100644 index 0000000..db5b676 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +@Data +public class EnumModel { + private String code; + private String name; +} From 787f12387de6c772a50d29c86b5128be9ae1b51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 17 Sep 2019 17:04:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BA=E7=9B=98=E7=82=B9=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=B6=E5=AE=83=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?+=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E8=B4=A8=E6=A3=80=E6=97=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=85=B3=E8=81=94=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E7=89=B9=E6=AE=8A=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/wms/bean/WmsMoveMaster.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index eb2a646..921d32d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -210,4 +210,7 @@ public class WmsMoveMaster extends BaseBean { public Double getTransQty(){ return this.transQty == null ? 0 : this.transQty.doubleValue(); } + public int getBusiTypeCodeVal(){ + return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue(); + } }