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/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 3935866..aa07354 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -32,7 +32,7 @@ public class DataLink extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="链接类型") - @FieldAnnotation(defaultValue = "CSV") + @FieldAnnotation(defaultValue = "EXCEL") private ApsEnumUtil.DATA_LINK_TYPE type; @Column(name="PATH") 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..5ffa2de --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +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 ="表名") + private String beanName; + + @Column(name="FIELD_NAME") + @ApiParam(value ="字段名") + private String fieldName; + + @Column(name="NAME") + @ApiParam(value ="名称") + 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..0d23467 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"); 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 cf2bec1..18c9e29 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 @@ -161,7 +161,8 @@ public class MesEnumUtil { DEFECT("DEFECT", "缺陷"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), - SCRAP("SCRAP", "报废原因"); + SCRAP("SCRAP", "报废原因"), + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"); private String value; private String description; @@ -1331,7 +1332,8 @@ public class MesEnumUtil { MES_STATION_BOM(210, "工位BOM表"), MES_DATA_OBJECT(220, "数据对象"), MES_OBJECT_CFG(230, "对象结构"), - MES_WC_CHECK(240, "开线检查"); + MES_WC_CHECK(240, "开线检查"), + MES_QC_CHECK_STANDARD(250, "质量检测标准"); private int value; private String description; @@ -1489,8 +1491,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_STATION_BOM_IS_REPEAT { - REPEATABLE(1, "可重复"), - NOT_REPEAT(2, "不可重复"); + REPEATABLE(1, "是"), + NOT_REPEAT(2, "否"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 5bfb46b..2669422 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -12,6 +12,43 @@ import org.apache.commons.lang3.StringUtils; **/ public class MesPcnEnumUtil { + /** + * MesMethod实体对应的methodType值 + * 10. + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum METHOD_TYPE { + + EXEC(10, "执行方法"), + COMPLETE(20, "完成方法"); + + private int value; + private String description; + + METHOD_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * mes 工位Bom 是否可重复 @@ -19,8 +56,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_STATION_BOM_IS_REPEAT { - REPEATABLE(1, "可重复"), - NOT_REPEAT(2, "不可重复"); + REPEATABLE(1, "是"), + NOT_REPEAT(2, "否"); private int value; private String description; @@ -179,7 +216,7 @@ public class MesPcnEnumUtil { } /** - * pcn 是否是关键件 + * MesProdBindRecord 是否是关键件 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_IS_BIND_KEY { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 3a5133e..91742c4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -368,7 +368,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCT_INSTOCK_STATUS { - CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"),CREATE_DOCMOVE(40, "生成移库单"),PULL_FAIL(50, "拉动出错"); + CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"), CREATE_DOCMOVE(40, "生成移库单"), PULL_FAIL(50, "拉动出错"); private int value; private String description; @@ -638,14 +638,15 @@ public class WmsEnumUtil { KT_REWORK(380, "KT_REWORK", "KT返工"), KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"), KT_SORTING(400, "KT_SORTING", "KT分选"), - VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"), - VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"), - KT_DEFINITE(430,"KT_DEFINITE", "KT合格"), - VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"), - KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"), - KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"), + VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"), + VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"), + KT_DEFINITE(430, "KT_DEFINITE", "KT合格"), + VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"), + KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), + KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), - KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"); + KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"), + PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"); private int value; private String code; @@ -826,8 +827,8 @@ public class WmsEnumUtil { VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"), VDA_SN_MERGE("VDA_SN_MERGE", "VDA条码合并"), VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), - VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"), - VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), + VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"), + VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PICK_RC("KT_PICK_RC", "坤泰拣货"); private String value; @@ -904,14 +905,16 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TASK_INFO_STATUS { - CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理") - , CLOSE(40, "已关闭"); + CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"), + FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭"); private int value; + private int code; private String description; - TASK_INFO_STATUS(int value, String description) { + TASK_INFO_STATUS(int value, int code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -919,6 +922,10 @@ public class WmsEnumUtil { return value; } + public int getCode() { + return code; + } + public String getDescription() { return description; } @@ -936,8 +943,20 @@ public class WmsEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } - } + public static TASK_INFO_STATUS codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } /** @@ -952,7 +971,7 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), - SCRAP(70, "报废"), + //SCRAP(70, "报废"), COMMING(80, "在途"); private int value; @@ -995,6 +1014,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 单据是否生成任务状态 */ @@ -1052,12 +1072,14 @@ public class WmsEnumUtil { return valueOf(val); } } + /** * 业务表：库存条码质检状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { - NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), + ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); private int value; private String code; @@ -1363,7 +1385,6 @@ public class WmsEnumUtil { } - /** * 质检业务状态 */ @@ -1436,6 +1457,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 质检业务类型 */ @@ -1476,6 +1498,7 @@ public class WmsEnumUtil { return valueOf(val); } } + /** * 作业记录参数状态 */ @@ -2339,13 +2362,14 @@ public class WmsEnumUtil { return tmp; } } + /** * NC处理 操作类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BUSI_OPERATION_TYPE { //收货改数 - GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数") ; + GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数"); private int value; private String code; @@ -2854,9 +2878,8 @@ public class WmsEnumUtil { } - public enum WMS_PART_TYPE_STR { - RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"),CONTAINER_PRODUCT("40", "容器"); + RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"); private String value; private String description; @@ -3815,7 +3838,8 @@ public class WmsEnumUtil { AUTO_OPT(20, "AUTO_OPT", "自动操作"), MENU_OPT(30, "MENU_OPT", "手工操作"), AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"), - CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"); + CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"), + UPDATE_TASK(60, "UPDATE_TASK", "复用任务"); private int value; private String code; private String description; @@ -4085,7 +4109,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SPEC_LEVEL { - FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"), FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层"); + FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"), FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java similarity index 68% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java index 02b19fc..da30dc1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -25,7 +26,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") -public class MesESOP extends BaseBean { +public class MesEsop extends BaseBean { @Column(name = "PART_NO") @ApiParam("零件号") @@ -55,35 +56,36 @@ public class MesESOP extends BaseBean { @ApiParam("工步序号") private Integer stepSeq; - @Column(name = "SOP_NAME") - @ApiParam("SOP名称") - private String sopName; + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; - @Column(name = "SOP_URL") - @ApiParam("SOP_URL") - private String sopUrl; + @Transient + @ApiParam("文件名称") + private String fileName; - @Column(name = "GROUP_NAME") - @ApiParam("GROUP_NAME") + @Transient + @ApiParam("文件URL") + private String fileUrl; + + @Transient + @ApiParam("组名") private String groupName; - @Column(name = "FILE_ORIGIN_NAME") - @ApiParam("FILE_ORIGIN_NAME") + @Transient + @ApiParam("文件原名") private String fileOriginName; - @Column(name = "FILE_SIZE") - @ApiParam("FILE_SIZE") + @Transient + @ApiParam("文件大小") private String fileSize; - @Column(name = "FILE_TYPE_ID") - @ApiParam("FILE_TYPE_ID") - private String fileTypeId; - - @Column(name = "FILE_TYPE_NAME") - @ApiParam("FILE_TYPE_NAME") - private String fileTypeName; + @Transient + @ApiParam("文件类型名称") + private String fileType; - @Column(name = "SYNC_TAG") - @ApiParam("SYNC_TAG") + @Transient + @ApiParam("同步标记") private Integer syncTag = 0; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java new file mode 100644 index 0000000..951539b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :mes系统业务事件 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EVENT") +@Api("系统业务事件") +public class MesEvent extends BaseBean { + @Column(name = "EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name = "EVENT_NAME") + @ApiParam("事件名称") + private String eventName; + + @Column(name = "EVENT_TYPE") + @ApiParam("事件类型") + private Integer eventType; + + @Column(name = "BUTTON_CODE") + @ApiParam("按钮代码") + private String buttonCode; + + public int getEventTypeVal() { + return this.eventType == null ? 0 : this.eventType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java new file mode 100644 index 0000000..fe29e51 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :mes系统业务事件动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EVENT_ACTION") +@Api("系统业务事件动作") +public class MesEventAction extends BaseBean { + @Column(name = "EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java new file mode 100644 index 0000000..eea9e56 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/4 1:28 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FILE") +@Api("文件表") +public class MesFile extends BaseBean { + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "GROUP_NAME") + @ApiParam("组名") + private String groupName; + + @Column(name = "FILE_ORIGIN_NAME") + @ApiParam("文件原名") + private String fileOriginName; + + @Column(name = "FILE_SIZE") + @ApiParam("文件大小") + private String fileSize; + + @Column(name = "FILE_TYPE") + @ApiParam("文件类型名称") + private String fileType; + + @Column(name = "SYNC_TAG") + @ApiParam("同步标记") + private Integer syncTag = 0; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java new file mode 100644 index 0000000..0316985 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :mes系统业务方法 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_METHOD") +@Api("系统业务方法") +public class MesMethod extends BaseBean { + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name = "METHOD_NAME") + @ApiParam("方法名称") + private String methodName; + + @Column(name = "CALL_CLASS") + @ApiParam("具体实现类") + private String callClass; + + /** + * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） + */ + @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java index db5ccea..984b9bf 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.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; /** * @Description: @@ -30,29 +31,24 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") - private String produceCategoryCode; + private String produceCtgyCode; @Column(name = "SIDE_LOCATION") @ApiParam("面位") private String sideLocation; - @Column(name = "PICTURE_URL") - @ApiParam("图片URL") - private String pictureUrl; - - @Column(name = "PICTURE_NAME") - @ApiParam("图片名称") - private String pictureName; + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; - @Column(name = "FILE_SIZE") - @ApiParam("FILE_SIZE") - private String fileSize; + @Transient + @ApiParam("文件名称") + private String fileName; - @Column(name = "FILE_TYPE_ID") - @ApiParam("FILE_TYPE_ID") - private String fileTypeId; + @Transient + @ApiParam("文件URL") + private String fileUrl; - @Column(name = "FILE_TYPE_NAME") - @ApiParam("FILE_TYPE_NAME") - private String fileTypeName; + @ApiParam("图片URL") + private String pictureUrl; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 48a1c26..5bc5ca1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -73,10 +73,14 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测值") private String checkValue; + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + public MesQcCheckStandard() { } - public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) { + public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { this.partNo = partNo; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; @@ -86,5 +90,6 @@ public class MesQcCheckStandard extends BaseBean { this.checkGuide = checkGuide; this.checkFrequency = checkFrequency; this.partName = partName; + this.checkItemType = checkItemType; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java new file mode 100644 index 0000000..3306bbf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 动作请求参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +public class ActionRequestBean implements Serializable { + + @ApiParam("事件代码") + @Deprecated + public String eventCode; + + @ApiParam("按钮代码") + public String buttonCode; + + @ApiParam("单个结果") + public Obj resultObject; + + @ApiParam("List请求集") + public List resultList; + + @ApiParam("Map请求集") + public Map resultMap; + + @ApiParam("目的状态") + private Integer destStatus; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java new file mode 100644 index 0000000..ac086ba --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/4 3:09 下午 + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class EsopFileModel { + + private MesEsop esop; + + private MesFile file; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java index 45bf859..231b12c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java @@ -35,6 +35,8 @@ public class RequestModel { private List orderNoList;//工单编号 + private ActionRequestBean actionRequestBean;//工单状态 + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { this.queueOrderList = queueOrderList; this.currentSeq = currentSeq; @@ -111,6 +113,10 @@ public class RequestModel { return orderNoList; } + public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; } + + public ActionRequestBean getActionRequestBean() { return actionRequestBean; } + public Double getCurrentSeq() { return currentSeq == null ? 0.0d : currentSeq; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java similarity index 68% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java index 9f76128..103e176 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesESOP; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; import org.springframework.stereotype.Repository; /** @@ -13,5 +13,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesESOPRepository extends BaseRepository { +public interface MesEsopRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java new file mode 100644 index 0000000..cfa330f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEvent; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEventRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java new file mode 100644 index 0000000..16383bc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java new file mode 100644 index 0000000..02911ac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTypeCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\4 10:34 + * @Modify: + **/ +public interface MesTypeCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 64e9d61..5b731c2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -371,4 +371,34 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } + + + + /** + * 按条件分页查询类型信息数据 + * @param typeCfg + * @return + */ + public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) { + + DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode()); + if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); + } + if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean); + } + if (!StringUtils.isEmpty(typeCfg.getTypeCode())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean); + } + + return packBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java similarity index 68% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java index 0f512b1..b7aa754 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -25,7 +26,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") -public class MesESOP extends BaseBean { +public class MesEsop extends BaseBean { @Column(name = "PART_NO") @ApiParam("零件号") @@ -55,36 +56,36 @@ public class MesESOP extends BaseBean { @ApiParam("工步序号") private Integer stepSeq; - @Column(name = "SOP_NAME") - @ApiParam("SOP名称") - private String sopName; + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; - @Column(name = "SOP_URL") - @ApiParam("SOP_URL") - private String sopUrl; + @Transient + @ApiParam("文件名称") + private String fileName; - @Column(name = "GROUP_NAME") - @ApiParam("GROUP_NAME") + @Transient + @ApiParam("文件URL") + private String fileUrl; + + @Transient + @ApiParam("组名") private String groupName; - @Column(name = "FILE_ORIGIN_NAME") - @ApiParam("FILE_ORIGIN_NAME") + @Transient + @ApiParam("文件原名") private String fileOriginName; - @Column(name = "FILE_SIZE") - @ApiParam("FILE_SIZE") + @Transient + @ApiParam("文件大小") private String fileSize; - @Column(name = "FILE_TYPE_ID") - @ApiParam("FILE_TYPE_ID") - private String fileTypeId; - - @Column(name = "FILE_TYPE_NAME") - @ApiParam("FILE_TYPE_NAME") - private String fileTypeName; + @Transient + @ApiParam("文件类型名称") + private String fileType; - @Column(name = "SYNC_TAG") - @ApiParam("SYNC_TAG") + @Transient + @ApiParam("同步标记") private Integer syncTag = 0; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java new file mode 100644 index 0000000..c1d30dd2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/4 1:28 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FILE") +@Api("文件表") +public class MesFile extends BaseBean { + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "GROUP_NAME") + @ApiParam("组名") + private String groupName; + + @Column(name = "FILE_ORIGIN_NAME") + @ApiParam("文件原名") + private String fileOriginName; + + @Column(name = "FILE_SIZE") + @ApiParam("文件大小") + private String fileSize; + + @Column(name = "FILE_TYPE") + @ApiParam("文件类型名称") + private String fileType; + + @Column(name = "SYNC_TAG") + @ApiParam("同步标记") + private Integer syncTag = 0; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index ae64067..5ebbca0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.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; /** * @Description: @@ -30,29 +31,17 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") - private String produceCategoryCode; + private String produceCtgyCode; @Column(name = "SIDE_LOCATION") @ApiParam("面位") private String sideLocation; - @Column(name = "PICTURE_URL") - @ApiParam("图片URL") - private String pictureUrl; + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; - @Column(name = "PICTURE_NAME") - @ApiParam("图片名称") - private String pictureName; - - @Column(name = "FILE_SIZE") - @ApiParam("FILE_SIZE") - private String fileSize; - - @Column(name = "FILE_TYPE_ID") - @ApiParam("FILE_TYPE_ID") - private String fileTypeId; - - @Column(name = "FILE_TYPE_NAME") - @ApiParam("FILE_TYPE_NAME") - private String fileTypeName; + @Transient + @ApiParam("文件名称") + private String fileName; } 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 9a81548..02de63d 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 @@ -129,6 +129,14 @@ public class MesProduceSn extends BaseBean { @ApiParam("返回信息") private String resultMsg; + @Transient + @ApiParam("下线开始时间") + private String outWorkCenterStartTime; + + @Transient + @ApiParam("下线结束时间") + private String outWorkCenterEndTime; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index 586e215..a315dc6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -93,29 +93,4 @@ public class MesQcCheckData extends BaseBean { @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; - - @Transient - @ApiParam("班次") - private String shiftCode; - - @Transient - @ApiParam("班组") - private String shiftGroup; - - @Transient - @ApiParam("班长") - private String squadLeader; - - @Transient - @ApiParam("工作单元名称") - private String workCellName; - - @Transient - @ApiParam("物料名称") - private String partNoName; - - public MesQcCheckData(String createDatetime, String createUser) { - super.createDatetime = createDatetime; - super.createUser = createUser; - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 2ef1cb0..60bea0a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -60,4 +60,8 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("频率") private String checkFrequency; + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsopFileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsopFileModel.java new file mode 100644 index 0000000..bfe428f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsopFileModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesEsop; +import cn.estsh.i3plus.pojo.mes.bean.MesFile; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/4 3:09 下午 + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class EsopFileModel { + + private MesEsop esop; + + private MesFile file; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java index d58ea90..b676a59 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java @@ -22,6 +22,9 @@ public class FastDfsDownloadModel { @ApiParam("部分相对路径") private String dirPath; + @ApiParam("fdfs文件路径") + private String fdfsPath; + @ApiParam("文件名称") private String fileName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 229352c..62cb029 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -86,6 +86,9 @@ public class MesPlcModel implements Serializable { @ApiParam("是否解析") private String isAnalysis; + @ApiParam("驱动") + private String device; + public MesPlcModel() { } @@ -93,7 +96,7 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -118,5 +121,6 @@ public class MesPlcModel implements Serializable { this.plcCfg = plcCfg; this.analysisRule = analysisRule; this.isAnalysis = isAnalysis; + this.device = device; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java new file mode 100644 index 0000000..cc2e482 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java @@ -0,0 +1,106 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\3 18:59 + * @Modify: + **/ +@Data +public class ProdBindRecordModel implements Serializable { + + private Long id; + private String createUser; + private String createDatetime; + private String modifyUser; + private String modifyDatetime; + + @ApiParam(value = "产品条码") + private String serialNumber; + + @ApiParam("产品条码零件号") + private String partNo; + + @ApiParam("产品条码零件名称") + private String partName; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam(value = "工作中心") + private String workCenterCode; + + @ApiParam(value = "工作单元") + private String workCellCode; + + @ApiParam(value = "工步代码") + private String stepCode; + + @ApiParam("原材料零件号") + private String itemPartNo; + + @ApiParam("原材料零件名称") + private String itemPartName; + + @ApiParam("原材料条码") + private String kpSn; + + @ApiParam(value = "原材料数量", example = "0") + private Double kpQty; + + @ApiParam("供应商") + private String supplierCode; + + @ApiParam + private String lotNo; + + @ApiParam + private Integer isFeed; + + @ApiParam("版本") + private String version; + + @ApiParam(value = "结果") + private String result; + + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + + @ApiParam(value = "动作类型") + private String actionType; + + public ProdBindRecordModel() { + + } + + public ProdBindRecordModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String partNo, String partName, String workOrderNo, String workCenterCode, String workCellCode, String stepCode, String itemPartNo, String itemPartName, String kpSn, Double kpQty, String supplierCode, String lotNo, Integer isFeed, String version, String result, Integer isBindKey, String actionType) { + this.id = id; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partName = partName; + this.workOrderNo = workOrderNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.stepCode = stepCode; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.kpSn = kpSn; + this.kpQty = kpQty; + this.supplierCode = supplierCode; + this.lotNo = lotNo; + this.isFeed = isFeed; + this.version = version; + this.result = result; + this.isBindKey = isBindKey; + this.actionType = actionType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java new file mode 100644 index 0000000..ae4142d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProduceCtgyPictureModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\4 16:44 + * @Modify: + **/ +@Data +public class ProduceCtgyPictureModel { + + private Long id; + private String createUser; + private String createDatetime; + private String modifyUser; + private String modifyDatetime; + private String organizeCode; + private Integer isValid; + private Integer isDeleted; + + @ApiParam("产品类型代码") + private String produceCtgyCode; + + @ApiParam("面位") + private String sideLocation; + + @ApiParam("文件id") + private Long fileId; + + @ApiParam("文件原名称") + private String fileOriginName; + @ApiParam("文件URL") + private String fileUrl; + @ApiParam("组名") + private String groupName; + + public ProduceCtgyPictureModel() { + } + + public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCtgyCode, String sideLocation, Long fileId, String fileOriginName, String fileUrl, String groupName) { + this.id = id; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.produceCtgyCode = produceCtgyCode; + this.sideLocation = sideLocation; + this.fileId = fileId; + this.fileOriginName = fileOriginName; + this.fileUrl = fileUrl; + this.groupName = groupName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java index f5d38f5..6146fe6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java @@ -9,6 +9,10 @@ import java.util.List; public class SysOrganizeModel { @Transient + @ApiParam(value = "id") + private Long id; + + @Transient @ApiParam(value = "父节点") private Long parentId; @@ -43,4 +47,12 @@ public class SysOrganizeModel { public void setName(String name) { this.name = name; } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java similarity index 60% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java index 367ef81..f255d1e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java @@ -1,8 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod; -import cn.estsh.i3plus.pojo.mes.bean.MesESOP; +import cn.estsh.i3plus.pojo.mes.bean.MesEsop; import org.springframework.stereotype.Repository; /** @@ -13,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesESOPRepository extends BaseRepository { +public interface MesEsopRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFileRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFileRepository.java new file mode 100644 index 0000000..d909e3f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFileRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFile; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index ae7e52e..6f6a532 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -416,14 +416,14 @@ public class MesHqlPack { * @param mesWcCheck * @return */ - public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck, organizeCode); + public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(wcCheck, organizeCode); // DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean); - DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesWcCheck.getCheckType(), "checkType", packBean); - DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckObj(), "checkObj", packBean); - DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckItem(), "checkItem", packBean); + DdlPreparedPack.getStringLikerPack(wcCheck.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(wcCheck.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(wcCheck.getCheckType(), "checkType", packBean); + DdlPreparedPack.getStringLikerPack(wcCheck.getCheckObj(), "checkObj", packBean); + DdlPreparedPack.getStringLikerPack(wcCheck.getCheckItem(), "checkItem", packBean); return packBean; } @@ -470,31 +470,26 @@ public class MesHqlPack { /** * MES 上传文件FastDfs封装 * - * @param mesESOP + * @param esop * @return */ - public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) { + public static DdlPackBean getEsopExcludeById(MesEsop esop, String org) { DdlPackBean packBean = getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean); - DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean); - DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean); - DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean); - DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean); + DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(esop.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringEqualPack(esop.getProcessCode(), "processCode", packBean); + DdlPreparedPack.getStringEqualPack(esop.getStepCode(), "stepCode", packBean); + DdlPreparedPack.getNumEqualPack(esop.getStepSeq(), "stepSeq", packBean); + DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean); return packBean; } - public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode); - if (!StringUtils.isEmpty(mesESOP.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); - } - if (!StringUtils.isEmpty(mesESOP.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean); - } - + public static DdlPackBean getEsop(MesEsop esop, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(esop, organizeCode); + DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(esop.getPartNo(), "partNo", packBean); return packBean; } @@ -1397,6 +1392,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) { DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean); } + if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItemType())) { + DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItemType(), "checkItemType", packBean); + } return packBean; } @@ -1423,28 +1421,6 @@ public class MesHqlPack { } /** - * MES 产品类型图片查询条件封装 - * - * @param mesProduceCtgyPicture - * @param organizeCode - * @return - */ - public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode); - if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean); - } - if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) { - DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean); - } - if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) { - DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean); - } - return packBean; - } - - - /** * 设备通知对象配置 查询条件封装 * * @param mesEquNotifyObjectCfg @@ -1876,6 +1852,10 @@ public class MesHqlPack { mesProduceSn.getCreateDateTimeStart(), mesProduceSn.getCreateDateTimeEnd(), "createDatetime", packBean, true); + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterStartTime(), + mesProduceSn.getOutWorkCenterEndTime(), + "outWorkCenterTime", packBean, true); return packBean; } @@ -1999,6 +1979,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckData.getSn())) { DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean); } + if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) { + DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean); + } if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) { DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCenterCode(), "workCenterCode", packBean); } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index 0cfa2c7..2c1d0f7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -76,4 +76,26 @@ public class StationRequestBean implements Serializable { @ApiParam("工步列表") private List stepList; + @Override + public String toString() { + return "StationRequestBean{" + + "scanInfo='" + scanInfo + '\'' + + ", serialNumber='" + serialNumber + '\'' + + ", partNo='" + partNo + '\'' + + ", organizeCode='" + organizeCode + '\'' + + ", organizeName='" + organizeName + '\'' + + ", workCenterCode='" + workCenterCode + '\'' + + ", workCellCode='" + workCellCode + '\'' + + ", routeCode='" + routeCode + '\'' + + ", processCode='" + processCode + '\'' + + ", clientInfo='" + clientInfo + '\'' + + ", userInfo='" + userInfo + '\'' + + ", buttonCode='" + buttonCode + '\'' + + ", stepCode='" + stepCode + '\'' + + ", busiType='" + busiType + '\'' + + ", workOrderNo='" + workOrderNo + '\'' + + ", tray='" + tray + '\'' + + ", finishCount=" + finishCount + + '}'; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFinalShipmentModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFinalShipmentModel.java new file mode 100644 index 0000000..c434dd5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFinalShipmentModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @author ealvis + * @date 2019/12/2 14:45 + * 昆泰成品发运看板model + */ +@Data +public class WmsFinalShipmentModel { + /*订单号*/ + private String orderNo; + /*车牌号*/ + private String carNo; + /*物料号*/ + private String partNo; + /*计划数量*/ + private Double qty; + /*已发运数量*/ + private Double pickQty; + /*计划发货时间*/ + private String planTime; + /*实际发运时间*/ + private String finishTime; + /*状态*/ + private Integer orderStatus; + + public WmsFinalShipmentModel(){ + + } + + public WmsFinalShipmentModel(String orderNo, String carNo, String partNo, Double qty, Double pickQty, String planTime, String finishTime, Integer orderStatus) { + this.orderNo = orderNo; + this.carNo = carNo; + this.partNo = partNo; + this.qty = qty; + this.pickQty = pickQty; + this.planTime = planTime; + this.finishTime = finishTime; + this.orderStatus = orderStatus; + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index b301b3e..a6a8dbb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -49,7 +49,7 @@ public class SysLogTaskTime extends BaseBean { @ApiParam(value ="调度服务器端口") private String schedulerServerPort; - @Column(name="TaskThreadId") + @Column(name="TASK_THREAD_ID") @ApiParam(value ="任务线程id") @JsonSerialize(using = ToStringSerializer.class) private Long taskThreadId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 1ea54c2..336e497 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -65,6 +65,11 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + // 1=true, 2 = false + @Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否连带提交创建状态移动单", example = "2") + private Integer isCommitRefMove; + @Lob @Column(name = "POSITION") @ApiParam(value = "GOJS位置") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 2a37527..382f210 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -34,15 +34,9 @@ public class WmsOperationBean extends BaseBean { @ApiParam("任务单号") public String taskNo; - /** - * 触发源: - * 10=扫描枪, - * 20=提交按钮, - * 30=重置按钮, - * 40=查看明细, - * 50=明细(删除), - * 60=明细（清空） - */ + @ApiParam("业务单号") + public String refSrc; + @ApiParam("触发源") public int sourceOwner; 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 a3d67fc..81642a2 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 @@ -603,6 +603,8 @@ public class WmsHqlPack { //供应商编号 DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result); + //客户编号 + DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getCustNo(), "custNo", result); //供应商简称 DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); //供应商全称