From 5e8e05ddb4830efcfca712d0393b3828ad0fd910 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 3 Dec 2019 14:05:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE=E5=BC=8F?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 2 +- .../i3plus/pojo/aps/bean/ExpressionRecord.java | 49 ++++++++++++++++++++++ .../i3plus/pojo/aps/bean/FurnaceCapacity.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 18 ++++---- .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 6 +-- .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 6 +-- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 8 ++-- .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 2 +- .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 6 +-- .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 4 +- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 6 +-- .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 4 +- .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 2 +- .../estsh/i3plus/pojo/aps/model/FunctionModel.java | 10 +++++ .../aps/repository/ExpressionRecordRepository.java | 9 ++++ .../src/main/resources/relations/ExportProject.xml | 8 ++-- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 3 +- 23 files changed, 117 insertions(+), 48 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExpressionRecordRepository.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 d569b69..e032535 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 @@ -38,7 +38,7 @@ public class BaseOrder extends BaseCode { @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; - @Column(name="COUNT") + @Column(name="COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") @FieldAnnotation(notEmpty = true) @Min(0) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java new file mode 100644 index 0000000..272f6d3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 保存的表达式录入记录 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-12-03 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_EXPRESSION_RECORD") +@Api("表达式记录") +public class ExpressionRecord extends BaseAPS { + @Column(name="BEAN_NAME") + @ApiParam(value ="表名") + @FieldAnnotation(property = false) + private String beanName; + + @Column(name="FIELD_NAME") + @ApiParam(value ="字段名") + @FieldAnnotation(property = false) + private String fieldName; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(notEmpty = true) + private String name; + + @Column(name="EXPRESSION") + @ApiParam(value ="表达式") + private String expression; + + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java index ea84c13..0d5f15e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java @@ -46,7 +46,7 @@ public class FurnaceCapacity extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Material") private String materialCode; - @Column(name="CAPACITY") + @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="容量限制") @Min(0) private Double capacity; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index ae52fcc..9d8340d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -32,7 +32,7 @@ import java.util.List; @Api("炉资源计划") public class FurnacePlan extends BaseAPS { - @Column(name="CAPACITY") + @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="已占用的能力") private Double capacity; 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 ad08ede..741324f 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 @@ -34,12 +34,12 @@ public class Inventory extends BaseOrder { @ApiParam(value ="指定上层订单") private String specifyUpOrder; - @Column(name="ASSIGN_COUNT") + @Column(name="ASSIGN_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="已分配量") @FieldAnnotation(modify = false) private Double assignCount; - @Column(name="EXCESS_COUNT") + @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="多余量") @FieldAnnotation(modify = false) private Double excessCount; 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 b6842e5..cb15093 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 @@ -80,40 +80,40 @@ public class Material extends BaseCode { @FieldAnnotation(defaultValue = "1") private Boolean autoFixPegging; - @Column(name="MAX_PRODUCT_BATCH") + @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大制造批量") private Double maxProductBatch; - @Column(name="MIN_PRODUCT_BATCH") + @Column(name="MIN_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最小制造批量") @FieldAnnotation(defaultValue = "0.0") private Double minProductBatch; - @Column(name="UNIT_PRODUCT_BATCH") + @Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="制造批量单位") private Double UnitProductBatch; - @Column(name="MAX_PUR_BATCH") + @Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大采购批量") private Double maxPurBatch; - @Column(name="MIN_PUR_BATCH") + @Column(name="MIN_PUR_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最小采购批量") private Double minPurBatch; - @Column(name="UNIT_PUR_BATCH") + @Column(name="UNIT_PUR_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="采购批量单位") private Double unitPurBatch; - @Column(name="MIN_STOCK_COUNT") + @Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="最小库存数量") private Double minStockCount; - @Column(name="SAFE_STOCK_COUNT") + @Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="安全库存数量") private Double safeStockCount; - @Column(name="MAX_STOCK_COUNT") + @Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大库存数量") private Double maxStockCount; 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 86c482c..53389da 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 @@ -39,15 +39,15 @@ public class OperInput extends BaseAPS { @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; - @Column(name="INPUT_COUNT") + @Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输入量") private Double inputCount; - @Column(name="YIELD") + @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") private Double yield; - @Column(name="FIX_SCRAP_COUNT") + @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") private Double fixScrapCount; 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 9160586..86c4996 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 @@ -38,15 +38,15 @@ public class OperOutput extends BaseAPS { @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; - @Column(name="OUTPUT_COUNT") + @Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输出量") private Double outputCount; - @Column(name="YIELD") + @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") private Double yield; - @Column(name="FIX_SCRAP_COUNT") + @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") private Double fixScrapCount; 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 135ab21..d115131 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 @@ -44,17 +44,17 @@ public class Operation extends BaseAPS { @FieldAnnotation(relation = "StandOperation", notEmpty = true) private Long standOperationId; - @Column(name="PREV_COUNT_RATE") + @Column(name="PREV_COUNT_RATE", columnDefinition = "decimal(18,8)") @ApiParam(value ="前工序数量比") @FieldAnnotation(notEmpty = true, defaultValue = "1.0") private Double prevCountRate; - @Column(name="YIELD") + @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") @FieldAnnotation(notEmpty = true, defaultValue = "1.0") private Double yield; - @Column(name="FIX_SCRAP_COUNT") + @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") private Double fixScrapCount; @@ -66,7 +66,7 @@ public class Operation extends BaseAPS { @ApiParam(value ="分割的工作个数") private Integer count; - @Column(name="BATCH") + @Column(name="BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="分割批量") private Double batch; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index ed4827d..9756426 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -32,7 +32,7 @@ import java.util.List; @Api("父工作") @ExcludeImportExport public class ParentWork extends BaseAPS { - @Column(name="count") + @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") private Double count; 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 8655079..e9471e8 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 @@ -71,7 +71,7 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="指定上层订单") private String specifyUpOrder; - @Column(name="ASSIGN_COUNT") + @Column(name="ASSIGN_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="已分配数量") private Double assignCount; @@ -84,12 +84,12 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; - @Column(name="EXCESS_COUNT") + @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="多余量") @FieldAnnotation(modify = false) private Double excessCount; - @Column(name="LACK_COUNT") + @Column(name="LACK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="缺少量") @FieldAnnotation(modify = false) private Double lackCount; 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 8d11194..bbf7a04 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 @@ -34,7 +34,7 @@ public class PurchaseOrder extends BaseOrder { @ApiParam(value ="指定上层订单") private String specifyUpOrder; - @Column(name="ASSIGN_COUNT") + @Column(name="ASSIGN_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="已分配数量") private Double assignCount; @@ -47,7 +47,7 @@ public class PurchaseOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; - @Column(name="EXCESS_COUNT") + @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="多余量") @FieldAnnotation(modify = false) private Double excessCount; 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 e16db49..96de9d2 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 @@ -30,7 +30,7 @@ import java.util.List; @Api("日历") public class ResCalendar extends BaseAPS { @Column(name="RES_CODES") - @ApiParam(value ="资源代码") + @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) private String resCodes; @@ -44,7 +44,7 @@ public class ResCalendar extends BaseAPS { private String dates; @Column(name="SHIFT_CODES") - @ApiParam(value ="班次代码") + @ApiParam(value ="班次编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "DayShift", notEmpty = true) private String shiftCodes; 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 39657b0..c9dc2e7 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 @@ -39,7 +39,7 @@ public class Resource extends BaseCode { @FieldAnnotation(defaultValue = "SINGLE") private ApsEnumUtil.RESOURCE_CLASS resClass; - @Column(name="EFFICIENCY") + @Column(name="EFFICIENCY", columnDefinition = "decimal(18,8)") @ApiParam(value ="生产效率") @FieldAnnotation(defaultValue = "1.0", notEmpty = true) private Double efficiency; @@ -52,7 +52,7 @@ public class Resource extends BaseCode { @ApiParam(value ="后缓冲时间") private String postBuffer; - @Column(name="MAX_PRODUCE_BATCH") + @Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大生产批量") private Double maxProduceBatch; 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 b5f79e1..90b158f 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 @@ -39,7 +39,7 @@ public class StandOperation extends BaseCode { @ApiParam(value ="分割的工作个数") private Integer count; - @Column(name="BATCH") + @Column(name="BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="分割批量") private Double batch; 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 3c5303c..3a8d8c4 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 @@ -46,7 +46,7 @@ public class Work extends BaseAPS { @FieldAnnotation(property = false) private ApsEnumUtil.WORK_TYPE workType; - @Column(name="count") + @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") @FieldAnnotation(modify = false) private Double count; @@ -70,7 +70,7 @@ public class Work extends BaseAPS { @FieldAnnotation(modify = false) private String planResource; - @Column(name="SPECIFY_COUNT") + @Column(name="SPECIFY_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="指定数量") private Double specifyCount; @@ -120,7 +120,7 @@ public class Work extends BaseAPS { @ApiParam(value ="已分割的工作是否固定") private Boolean fixSplit; - @Column(name="NEED_PREV_COUNT") + @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="需要的前工作数量") @FieldAnnotation(display = false, modify = false) private Double needPrevCount; 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 e84ac02..94e1a71 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 @@ -39,12 +39,12 @@ public class WorkInput extends BaseAPS { @FieldAnnotation(relation = "Material") private Long materialId; - @Column(name="INPUT_COUNT") + @Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="输入数量") @FieldAnnotation(modify = false) private Double inputCount; - @Column(name="SHORT_COUNT") + @Column(name="SHORT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="短缺数量") @FieldAnnotation(modify = false) private Double shortCount; 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 b3c4aaa..ef453ce 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 @@ -41,12 +41,12 @@ public class WorkOutput extends BaseAPS { @FieldAnnotation(relation = "Material") private Long materialId; - @Column(name="OUTPUT_COUNT") + @Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="输出数量") @FieldAnnotation(modify = false) private Double outputCount; - @Column(name="REMAIN_COUNT") + @Column(name="REMAIN_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="多余数量") @FieldAnnotation(modify = false) private Double remainCount; 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 9343d9e..4a5e01f 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 @@ -53,7 +53,7 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(relation = "PostWork") private Long postWorkId; - @Column(name="COUNT") + @Column(name="COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="关联数量") @FieldAnnotation(modify = false) private Double count; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java new file mode 100644 index 0000000..b810c25 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +@Data +public class FunctionModel { + private String code; + private String name; + private String params; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExpressionRecordRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExpressionRecordRepository.java new file mode 100644 index 0000000..07a2034 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExpressionRecordRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ExpressionRecord; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ExpressionRecordRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml index 778bd55..09852b2 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml @@ -1,7 +1,7 @@ - - - - + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 3217940..de9a06f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -60,6 +60,7 @@ public class ApsEnumUtil { PRODUCT("PRODUCT", "成品"), HALF_PRODUCT("HALF_PRODUCT", "半成品"), RAW_MATERIAL("RAW_MATERIAL", "原材料"), + INNER_PRODUCT("INNER_PRODUCT", "中间品"), VIRTUAL("VIRTUAL", "虚拟件"); private String value; @@ -978,7 +979,7 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_LINK_TYPE { - CSV("CSV", "csv文件"), + EXCEL("EXCEL", "EXCEL文件"), MYSQL("MYSQL", "MySql"), ORACLE("ORACLE", "Oracle"), SQLSERVER("SQLSERVER", "SqlServer");