diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java deleted file mode 100644 index 122226c..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.bean; - -import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; -import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @Description :BOM树 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -@Data -@EqualsAndHashCode(callSuper = true) -@Api("BOM树") -@ExcludeImportExport -public class BomTree extends BaseAPS { - - @ApiParam(value ="物料类型") - private ApsEnumUtil.MATERIAL_TYPE type; - - @ApiParam(value ="备料类型") - private ApsEnumUtil.PREPARE_TYPE prepareType; - - @ApiParam(value ="补充类型") - private ApsEnumUtil.REPLENISHMENT_TYPE replType; - - @ApiParam(value ="采购提前期") - private String purchaseLeadTime; - - @ApiParam(value ="制造提前期") - private String manufLeadTime; - - @ApiParam(value ="配送提前期") - private String shipmentLeadTime; - - @ApiParam(value ="单位采购量") - private Integer unitPurchase; - - @ApiParam(value ="单位制造量") - private Integer unitManuf; - - @ApiParam(value ="单位配送量") - private Integer unitShipment; -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index b8563c0..8183437 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -38,6 +38,12 @@ public class ExportProject extends BaseAPS { @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; + @ApiParam(value ="当前执行的明细序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的明细名称") + private transient String curDetailName; + public DataLink getLink() { return BeanRelation.get(this, EExportProject.Link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 1c3c598..4199073 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -42,5 +43,6 @@ public class HeuristicRule extends BaseRule { @Column(name="BATCH_PERIOD") @ApiParam(value ="组炉区间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String batchPeriod; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 7d8f02d..6cc2b67 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -37,6 +37,12 @@ public class ImportProject extends BaseAPS { @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; + @ApiParam(value ="当前执行的明细序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的明细名称") + private transient String curDetailName; + public DataLink getLink() { return BeanRelation.get(this, EImportProject.Link); } 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 694c22a..7c7c313 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 @@ -61,14 +61,17 @@ public class Material extends BaseAPS { @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String purchaseLeadTime; @Column(name="MANUF_LEAD_TIME") @ApiParam(value ="制造提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String manufLeadTime; @Column(name="SHIPMENT_LEAD_TIME") @ApiParam(value ="配送提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String shipmentLeadTime; @Column(name="UNIT_PURCHASE") @@ -121,18 +124,22 @@ public class Material extends BaseAPS { @Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="最小库存数量") + @FieldAnnotation(property = false) private Double minStockCount; @Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="安全库存数量") + @FieldAnnotation(property = false) private Double safeStockCount; @Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大库存数量") + @FieldAnnotation(property = false) private Double maxStockCount; @Column(name="ORDER_BATCH_PERIOD") @ApiParam(value ="订单合并期间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String orderBatchPeriod; @JsonBackReference 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 53389da..11cedff 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 @@ -34,21 +34,24 @@ public class OperInput extends BaseAPS { @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) private Long operationId; - @Column(name="MATERIAL_ID") + @Column(name="INPUT_MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(relation = "Material", notEmpty = true) - private Long materialId; + @FieldAnnotation(relation = "InputMaterial", notEmpty = true) + private Long inputMaterialId; @Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输入量") + @FieldAnnotation(defaultValue = "1.0") private Double inputCount; @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") + @FieldAnnotation(defaultValue = "1.0") private Double yield; @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") + @FieldAnnotation(defaultValue = "0.0") private Double fixScrapCount; @Column(name="CONS_TYPE") @@ -58,10 +61,12 @@ public class OperInput extends BaseAPS { @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxSpaceTime; @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; public Operation getOperation() { @@ -73,13 +78,13 @@ public class OperInput extends BaseAPS { BeanRelation.set(this, EOperInput.Operation, oper); } - public Material getMaterial() { - return BeanRelation.get(this, EOperInput.Material); + public Material getInputMaterial() { + return BeanRelation.get(this, EOperInput.InputMaterial); } - public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; - BeanRelation.set(this, EOperInput.Material, material); + public void setInputMaterial(Material material) { + this.inputMaterialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperInput.InputMaterial, material); } @JsonBackReference 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 86c4996..476d45b 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 @@ -33,21 +33,24 @@ public class OperOutput extends BaseAPS { @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) private Long operationId; - @Column(name="MATERIAL_ID") + @Column(name="OUTPUT_MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(relation = "Material", notEmpty = true) - private Long materialId; + private Long outputMaterialId; @Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输出量") + @FieldAnnotation(defaultValue = "1.0") private Double outputCount; @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") + @FieldAnnotation(defaultValue = "1.0") private Double yield; @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") + @FieldAnnotation(defaultValue = "0.0") private Double fixScrapCount; public Operation getOperation() { @@ -59,13 +62,13 @@ public class OperOutput extends BaseAPS { BeanRelation.set(this, EOperOutput.Operation, oper); } - public Material getMaterial() { - return BeanRelation.get(this, EOperOutput.Material); + public Material getOutputMaterial() { + return BeanRelation.get(this, EOperOutput.OutputMaterial); } - public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; - BeanRelation.set(this, EOperOutput.Material, material); + public void setOutputMaterial(Material material) { + this.outputMaterialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperOutput.OutputMaterial, material); } @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 0568af5..b6923c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -46,27 +46,32 @@ public class OperResource extends BaseAPS { @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - @FieldAnnotation(notEmpty = true) + @FieldAnnotation(notEmpty = true, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String postTime; @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPrevSdTime; @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPostSdTime; @Column(name="PRIORITY") 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 d115131..274574b 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 @@ -77,10 +77,12 @@ public class Operation extends BaseAPS { @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxSpaceTime; @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; public ProductRouting getProductRouting() { 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 7eb002d..37548d8 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductOrder; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -51,6 +52,7 @@ public class ProductOrder extends BaseOrder { @Column(name="SPECIFY_ROUTING") @ApiParam(value ="指定工艺路线") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting") private String specifyRouting; @Column(name="RECALC_COUNT") @@ -72,6 +74,7 @@ public class ProductOrder extends BaseOrder { @Column(name="SPECIFY_LEAD_TIME") @ApiParam(value ="指定提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String specifyLeadTime; @Column(name="CALC_LEAD_TIME") 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 bbf7a04..b6687d9 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -40,6 +41,7 @@ public class PurchaseOrder extends BaseOrder { @Column(name="SPECIFY_LEAD_TIME") @ApiParam(value ="指定提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String specifyLeadTime; @Column(name="CALC_LEAD_TIME") 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 963ff6f..515cd7b 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 @@ -60,10 +60,12 @@ public class Resource extends BaseAPS { @Column(name="PREV_BUFFER") @ApiParam(value ="前缓冲时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String prevBuffer; @Column(name="POST_BUFFER") @ApiParam(value ="后缓冲时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String postBuffer; @Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)") @@ -80,14 +82,17 @@ public class Resource extends BaseAPS { @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPrevSdTime; @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPostSdTime; @Column(name="ROUND_TYPE") @@ -117,6 +122,7 @@ public class Resource extends BaseAPS { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间长度") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String lockTime; @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 9c126d1..85b3191 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -37,6 +37,12 @@ public class RuleGroup extends BaseAPS { @ApiParam(value ="序号") private Integer orderNumber; + @ApiParam(value ="当前执行的规则序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的规则名称") + private transient String curDetailName; + @JsonBackReference public List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 0dae95e..d973fb4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -41,6 +42,7 @@ public class SalesOrder extends BaseOrder { @Column(name="SPECIFY_LEAD_TIME") @ApiParam(value ="指定提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String specifyLeadTime; @Column(name="CALC_LEAD_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index 510e091..e0786d8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -211,7 +211,12 @@ public class BeanInfo { } public static Set> getBeanClasses() { - return beanInfos.keySet(); + Set> beanClasses = new HashSet<>(); + for (Map.Entry, BeanInfo> entry : beanInfos.entrySet()) { + beanClasses.add(entry.getKey()); + } + + return beanClasses; } public static BeanInfo getBeanInfo(Class cls) { @@ -234,9 +239,9 @@ public class BeanInfo { public static List> getChildClasses(Class cls) { List> beanClasses = new ArrayList<>(); - List beanInfos = getBeanInfo(cls).childsBeanInfos; - for (BeanInfo beanInfo : beanInfos) { - beanClasses.add(beanInfo.getBeanClass()); + List childBeanInfos = getBeanInfo(cls).childsBeanInfos; + for (BeanInfo childBeanInfo : childBeanInfos) { + beanClasses.add(childBeanInfo.getBeanClass()); } return beanClasses; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java index 20863b2..35cc4ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; +import org.springframework.util.StringUtils; import java.io.IOException; import java.text.ParseException; @@ -15,10 +16,12 @@ public class CustomDateDeserializer extends JsonDeserializer { @Override public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { - try { - return DATETIME_FORMATOR.parse(jsonParser.getText()); - } catch (ParseException e) { - e.printStackTrace(); + String text = jsonParser.getText(); + if (!StringUtils.isEmpty(text)) { + try { + return DATETIME_FORMATOR.parse(text); + } catch (ParseException e) { + } } return null; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java index 4ee6467..9ce8642 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java @@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EOperInput { Operation, - Material, + InputMaterial, WorkInputs } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java index 898f576..df02363 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java @@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EOperOutput { Operation, - Material, + OutputMaterial, WorkOutputs } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java index 51f1ba0..6376ea3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java @@ -40,4 +40,5 @@ public class APSPager extends Pager { } private String filter; private List sorts; + private String query; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java new file mode 100644 index 0000000..6a67f59 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +/** + * @Description : 进度条显示信息。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-01-21 + * @Modify: + **/ +@Data +public class RuleGroupProgress { + private String message; + private Long progress; +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml index e2d484c..1107e5c 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml index 5a7f843..2f030d9 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java similarity index 81% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 2e2b0a2..2d18d24 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -9,8 +9,8 @@ import java.lang.annotation.*; */ @Documented @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) -public @interface FieldAnnotation { +@Target({ElementType.FIELD, ElementType.TYPE}) +public @interface DynamicField { // Web前端字段数据类型 WmsEnumUtil.FIELD_TYPE webFieldType(); // 条件表达式:>,<,>=等 @@ -31,4 +31,8 @@ public @interface FieldAnnotation { int isRequire() default 1; // 是否表单字段展示:默认1-显示，2-隐藏 int isShow() default 1; + // 是否跳过本字段扫描 0-不跳过，1-跳过 + int isSkip() default 0; + // 下拉枚举名称 + String enumName() default ""; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9c10c6c..116abff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; @@ -41,7 +41,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) public Long id; //get单独处理 @@ -62,21 +62,21 @@ public abstract class BaseBean implements Serializable { this.id = id; } - @Column(name="ORGANIZE_CODE") + @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) // @AnnoOutputColumn(hidden = true) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @@ -84,58 +84,64 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String createDatetime; @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String modifyUser; @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String modifyDatetime; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeEnd; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeEnd; @Transient @ApiParam(value = "排序属性") @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String orderByParam = ""; @Transient @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; 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 f7f6ab7..5338751 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 @@ -333,7 +333,7 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RESOURCE_LOCK_TYPE { - NONE("NONE", "不锁定"), // + NONE("NONE", "不锁定"), PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"), PRODUCE_END("PRODUCE_END", "后工序生产结束时刻"); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 7fdc930..ef96546 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1843,151 +1843,6 @@ public class BlockFormEnumUtil { } } - /** - * 数据库连接方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_SOURCE_TYPE { - SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), - SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), - SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), - SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); - - private int value; - private String code; - private String description; - private String driverClassName; - private int defaultPort; - private String defaultSchemaPattern; - - private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { - this.value = value; - this.code = code; - this.description = description; - this.driverClassName = driverClassName; - this.defaultPort = port; - this.defaultSchemaPattern = defaultSchemaPattern; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public String getDriverClassName() { - return driverClassName; - } - - public int getDefaultPort() { - return defaultPort; - } - - public String getDefaultSchemaPattern() { - return defaultSchemaPattern; - } - - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static int codeOfValue(String code) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].value; - } - } - return tmp; - } - - 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; - } - - public static DATA_SOURCE_TYPE valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - return values()[i]; - } - } - return null; - } - - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - - public String getJDBCUrl(String database,String host,Integer port){ - if(this.getValue() == SOURCE_MARIA_DB.getValue()){ - return getJDBCUrlMySQL(database,host,port); - }else if(this.getValue() == SOURCE_ORACLE.getValue()){ - return getJDBCUrlOracle(database,host,port); - }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ - return getJDBCUrlPostgreSQL(database,host,port); - }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ - return getJDBCUrlSQLServer(database,host,port); - } - return null; - } - - public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ - if(StringUtils.isNotBlank(databaseProductName)){ - if(databaseProductName.indexOf(":mysql:") != -1){ - return SOURCE_MARIA_DB; - }else if(databaseProductName.indexOf(":oracle:") != -1){ - return SOURCE_ORACLE; - }else if(databaseProductName.indexOf(":postgresql:") != -1){ - return SOURCE_POSTGRE_SQL; - }else if(databaseProductName.indexOf(":sqlserver:") != -1){ - return SOURCE_SQL_SERVER; - } - } - return null; - } - - private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; - } - - private String getJDBCUrlOracle(String database,String host,Integer port){ - return "jdbc:oracle:thin:@"+host+":"+port+":"+database; - } - - private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ - return "jdbc:postgresql://"+host+":"+port+"/"+database; - } - - private String getJDBCUrlSQLServer(String database,String host,Integer port){ - return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; - } - } - @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_STATUS { CONN_SUCCESS(10, "连接成功", "连接成功"), diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index 9fc03f1..f012813 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -286,7 +286,8 @@ public class BlockReportEnumUtil { ECHARTS_PIE(10, "饼图", "实芯饼图"), ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"), ECHARTS_LINE(30, "折线图", "向右折线条图"), - ECHARTS_TREEMAP(40, "矩形图", "矩形图"); + ECHARTS_TREEMAP(40, "矩形图", "矩形图"), + SELECT_SINGLE(50, "下拉单选", "下拉单选"); private int value; private String name; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index e1d4eae..da17aec 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -331,6 +331,7 @@ public class BlockSoftSwitchEnumUtil { /** * 数据库连接方式 */ + @Deprecated // 不建议使用 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 873e21d..fff23d9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -27,6 +27,9 @@ public class CommonEnumUtil { MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"), SWEB(7, 8800, 19, "i3sweb", "供应商服务"), + PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"), + PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"), + FORM(20, 8900, 16, "block-form", "智能表单"), REPORT(21, 8910, 17, "block-report", "智能报表"), WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"), @@ -35,7 +38,7 @@ public class CommonEnumUtil { HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"), LAC(26, 8600, 13, "lac", "连接适配器"), ANDON(27, 8500, 14, "andon", "安灯"), - APS(28, 8410, 15, "APS", "高级计划与排程"), + APS(28, 8400, 15, "i3aps", "高级计划与排程"), CENTER(99, 8000, 1, "icloud-server", "注册中心"), SURFACE(98, 0, 0, "i3surface", "对外服务"), CLOUD(97, 0, 0, "i3cloud", "微服务"), @@ -1295,7 +1298,8 @@ public class CommonEnumUtil { // DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), // ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), - CASCADE(900, "CASCADE", "级联"); + CASCADE(900, "CASCADE", "级联"), + PICK_UP(1000, "PICK_UP", "拾取"); //FILE(400, "file", "文件"), //IMAGE(410, "image", "image"), //OFF(500, "color", "颜色"), @@ -1394,17 +1398,17 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SQL_WHERE { - EQUAL(1, " = ", "等于"), - NOT_EQUAL(2, " <> ", "不等于"), - MORE(3, " > ", "大于"), - LESS(4, " < ", "小于"), - MORE_OR_EQUAL(5, " >= ", "大于等于"), - LESS_OR_EQUAL (6, " <= ", "小于等于"), - LIKE(7, " LIKE ", "全模糊"), - START_LIKE(7, " LIKE ", "前模糊"), - END_LIKE(7, " LIKE ", "后模糊"), - IN(8, " IN ", " in "), - BETWEEN(9, " BETWEEN ", "区间查询(逗号区分)"),; + EQUAL(10, " = ", "等于"), + NOT_EQUAL(11, " <> ", "不等于"), + MORE(20, " > ", "大于"), + LESS(30, " < ", "小于"), + MORE_OR_EQUAL(21, " >= ", "大于等于"), + LESS_OR_EQUAL (31, " <= ", "小于等于"), + LIKE(40, " LIKE ", "全模糊"), + START_LIKE(41, " LIKE ", "前模糊"), + END_LIKE(52, " LIKE ", "后模糊"), + IN(50, " IN ", " in "), + BETWEEN(60, " BETWEEN ", "区间查询(逗号区分)"),; private int value; private String code; @@ -1721,4 +1725,150 @@ public class CommonEnumUtil { } } + + /** + * 数据库连接方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_SOURCE_TYPE { + SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), + SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), + SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), + SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); + + private int value; + private String code; + private String description; + private String driverClassName; + private int defaultPort; + private String defaultSchemaPattern; + + private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { + this.value = value; + this.code = code; + this.description = description; + this.driverClassName = driverClassName; + this.defaultPort = port; + this.defaultSchemaPattern = defaultSchemaPattern; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public String getDriverClassName() { + return driverClassName; + } + + public int getDefaultPort() { + return defaultPort; + } + + public String getDefaultSchemaPattern() { + return defaultSchemaPattern; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + 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; + } + + public static DATA_SOURCE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public String getJDBCUrl(String database,String host,Integer port){ + if(this.getValue() == SOURCE_MARIA_DB.getValue()){ + return getJDBCUrlMySQL(database,host,port); + }else if(this.getValue() == SOURCE_ORACLE.getValue()){ + return getJDBCUrlOracle(database,host,port); + }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ + return getJDBCUrlPostgreSQL(database,host,port); + }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ + return getJDBCUrlSQLServer(database,host,port); + } + return null; + } + + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + if(StringUtils.isNotBlank(databaseProductName)){ + if(databaseProductName.indexOf(":mysql:") != -1){ + return SOURCE_MARIA_DB; + }else if(databaseProductName.indexOf(":oracle:") != -1){ + return SOURCE_ORACLE; + }else if(databaseProductName.indexOf(":postgresql:") != -1){ + return SOURCE_POSTGRE_SQL; + }else if(databaseProductName.indexOf(":sqlserver:") != -1){ + return SOURCE_SQL_SERVER; + } + } + return null; + } + + private String getJDBCUrlMySQL(String database,String host,Integer port){ + return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + } + + private String getJDBCUrlOracle(String database,String host,Integer port){ + return "jdbc:oracle:thin:@"+host+":"+port+":"+database; + } + + private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ + return "jdbc:postgresql://"+host+":"+port+"/"+database; + } + + private String getJDBCUrlSQLServer(String database,String host,Integer port){ + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; + } + } + } 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 2a7e925..bc83711 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 @@ -13,17 +13,51 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 动作-module + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_ACTION_MODULE { + WORK_ORDER_LANDED(10, "生产工单下达"); + + private int value; + private String description; + + MES_ACTION_MODULE(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; + } + } + + /** * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_PATTERN_TYPE { + public enum JIS_PATTERN_TYPE { ONE_PROD(10, "单产品发运"), MANY_PROD(20, "多产品发运"); private int value; private String description; - MES_JIS_PATTERN_TYPE(int value, String description) { + JIS_PATTERN_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -3345,6 +3379,7 @@ public class MesEnumUtil { TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), + STOP_PCS_CTL("stopPcsCtl", "停止监控"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); @@ -3385,7 +3420,8 @@ public class MesEnumUtil { EXP_TEXT("exp_text", "异常文本"), FILE("file", "定制内容文件"), IMAGE("image", "图片"), - BUTTON("button", "按钮"); + BUTTON("button", "按钮"), + TABLES("tables", "多个表格"); private String value; private String description; @@ -3945,4 +3981,85 @@ public class MesEnumUtil { } } + /** + * MesMonitorTask实体对应的status值 监听任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + MONITOR_TASK_STATUS(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; + } + } + + /** + * 监听任务任务对象类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_OBJECT_TYPE { + + PLC(10, "PLC"); +// DB(20, "DB"); + + private int value; + private String description; + + MONITOR_TASK_OBJECT_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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } 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 5c3308e..6bd6523 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 @@ -16,49 +16,14 @@ public class MesPcnEnumUtil { * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_PATTERN_TYPE { + public enum JIS_PATTERN_TYPE { ONE_PROD(10, "单产品发运"), MANY_PROD(20, "多产品发运"); private int value; private String description; - MES_JIS_PATTERN_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; - } - } - - /** - * JIS发运是否按主队列顺序扫描 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_SCAN_TYPE { - TRUE(10, "是"), - FALSE(20, "否"); - - private int value; - private String description; - - MES_JIS_SCAN_TYPE(int value, String description) { + JIS_PATTERN_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -86,7 +51,7 @@ public class MesPcnEnumUtil { * JIS发运队列状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIS_STATUS { + public enum JIS_QUEUE_STATUS { TRUE(10, "已发运"), FALSE(20, "未发运"); @@ -94,7 +59,7 @@ public class MesPcnEnumUtil { private int value; private String description; - MES_QUEUE_JIS_STATUS(int value, String description) { + JIS_QUEUE_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -1530,13 +1495,16 @@ public class MesPcnEnumUtil { /** * 数据库连接方式 + * wei.peng + * Copy 代码禁止修改枚举内容,整合枚举会产生兼容性问题 ; */ + @Deprecated // 不推荐使用 ， 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { - SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), - SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), - SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null), - SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"); + SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), + SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), + SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null), + SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"); private int value; private String code; @@ -1767,8 +1735,8 @@ public class MesPcnEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"), - JIT_ORDER(50, "JIT工单"); + BH_ORDER(40, "B&H工单"); +// JIT_ORDER(50, "JIT工单"); private int value; private String description; @@ -2473,9 +2441,9 @@ public class MesPcnEnumUtil { TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), + STOP_PCS_CTL("stopPcsCtl", "停止监控"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); - private String value; private String description; @@ -2513,7 +2481,8 @@ public class MesPcnEnumUtil { EXP_TEXT("exp_text", "异常文本"), FILE("file", "定制内容文件"), IMAGE("image", "图片"), - BUTTON("button", "按钮"); + BUTTON("button", "按钮"), + TABLES("tables", "多个表格"); private String value; private String description; @@ -2685,4 +2654,156 @@ public class MesPcnEnumUtil { } } + /** + * 监听任务任务对象类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_OBJECT_TYPE { + + PLC(10, "PLC"); +// DB(20, "DB"); + + private int value; + private String description; + + MONITOR_TASK_OBJECT_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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * MesMonitorTask实体对应的status值 监听任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + MONITOR_TASK_STATUS(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; + } + } + + /** + * 是否解析 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_IS_PARSE { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + PLC_IS_PARSE(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; + } + } + + /** + * 质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PASS_FAIL { + + PASS(1, "合格"), + FAIL(2, "不合格"); + + private int value; + private String description; + + PASS_FAIL(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; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java new file mode 100644 index 0000000..465551f --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public class PtlEnumUtil { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java new file mode 100644 index 0000000..8ae1488 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -0,0 +1,725 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.util.StringUtils; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public class PtlPcnEnumUtil { + + /** + * 标签器LED数字解析枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAG_LED_CONTENT_CMD { + TAG_0("30", "0", "0"), + TAG_1("31", "1", "1"), + TAG_2("32", "2", "2"), + TAG_3("33", "3", "3"), + TAG_4("34", "4", "4"), + TAG_5("35", "5", "5"), + TAG_6("36", "6", "6"), + TAG_7("37", "7", "7"), + TAG_8("38", "8", "8"), + TAG_9("39", "9", "9"), + TAG_A("41", "A", "A"), + TAG_b("62", "b", "b"), + TAG_C("43", "C", "C"), + TAG_d("64", "d", "d"), + TAG_E("45", "E", "E"), + TAG_F("46", "F", "F"), + TAG_c("63", "c", "c"), + TAG_H("48", "H", "H"), + TAG_L("4C", "L", "L"), + TAG_SPACE("20", " ", " "), + TAG_n("6E", "n", "n"), + TAG_o("6F", "o", "o"), + TAG_h("68", "h", "h"), + TAG_r("72", "r", "r"), + TAG_u("75", "u", "u"), + TAG_i("69", "i", "i"), + TAG_y("79", "y", "y"), + TAG_t("74", "t", "t"), + TAG_q("71", "q", "q"), + TAG_G("47", "G", "G"), + TAG_S("53", "S", "S"), + TAG_l("6C", "l", "l"), + TAG_O("4F", "O", "O"), + TAG_SQUARE_BRACKET_LEFT("5B", "[", "["), + TAG_SQUARE_BRACKET_RIGHT("5D", "]", "]"), + TAG_P("50", "P", "P"), + TAG_U("55", "U", "U"), + TAG_HYPHEN("2D", "-", "-"); + + private String code; + private String value; + private String description; + + TAG_LED_CONTENT_CMD(String code, String value, String description) { + this.code = code; + this.value = value; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].code; + } + } + return tmp; + } + } + + /** + * 标签器LED小数点解析枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAG_LED_POINT_CMD { + TAG_POINT_0("00", "000000", "000000"), + TAG_POINT_1("01", "000000.", "000000."), + TAG_POINT_2("02", "00000.0", "00000.0"), + TAG_POINT_12("03", "00000.0.", "00000.0."), + TAG_POINT_3("04", "0000.00", "0000.00"), + TAG_POINT_13("05", "0000.00.", "0000.00."), + TAG_POINT_23("06", "0000.0.0", "0000.0.0"), + TAG_POINT_123("07", "0000.0.0.", "0000.0.0."), + TAG_POINT_4("08", "000.000", "000.000"), + TAG_POINT_14("09", "000.000.", "000.000."), + TAG_POINT_24("0A", "000.00.0", "000.00.0"), + TAG_POINT_124("0B", "000.00.0.", "000.00.0."), + TAG_POINT_34("0C", "000.0.00", "000.0.00"), + TAG_POINT_134("0D", "000.0.00.", "000.0.00."), + TAG_POINT_234("0E", "000.0.0.0", "000.0.0.0"), + TAG_POINT_1234("0F", "000.0.0.0.", "000.0.0.0."), + TAG_POINT_5("10", "00.0000", "00.0000"), + TAG_POINT_15("11", "00.0000.", "00.0000."), + TAG_POINT_25("12", "00.000.0", "00.000.0"), + TAG_POINT_125("13", "00.000.0.", "00.000.0."), + TAG_POINT_35("14", "00.00.00", "00.00.00"), + TAG_POINT_135("15", "00.00.00.", "00.00.00."), + TAG_POINT_235("16", "00.00.0.0", "00.00.0.0"), + TAG_POINT_1235("17", "00.00.0.0.", "00.00.0.0."), + TAG_POINT_45("18", "00.0.000", "00.0.000"), + TAG_POINT_145("19", "00.0.000.", "00.0.000."), + TAG_POINT_245("1A", "00.0.00.0", "00.0.00.0"), + TAG_POINT_1245("1B", "00.0.00.0.", "00.0.00.0."), + TAG_POINT_345("1C", "00.0.0.00", "00.0.0.00"), + TAG_POINT_1345("1D", "00.0.0.00.", "00.0.0.00."), + TAG_POINT_2345("1E", "00.0.0.0.0", "00.0.0.0.0"), + TAG_POINT_12345("1F", "00.0.0.0.0.", "00.0.0.0.0."), + TAG_POINT_6("20", "0.00000", "0.00000"), + TAG_POINT_16("21", "0.00000.", "0.00000."), + TAG_POINT_26("22", "0.0000.0", "0.0000.0"), + TAG_POINT_126("23", "0.0000.0.", "0.0000.0."), + TAG_POINT_36("24", "0.000.00", "0.000.00"), + TAG_POINT_136("25", "0.000.00.", "0.000.00."), + TAG_POINT_236("26", "0.000.0.0", "0.000.0.0"), + TAG_POINT_1236("27", "0.000.0.0.", "0.000.0.0."), + TAG_POINT_46("28", "0.00.000", "0.00.000"), + TAG_POINT_146("29", "0.00.000.", "0.00.000."), + TAG_POINT_246("2A", "0.00.00.0", "0.00.00.0"), + TAG_POINT_1246("2B", "0.00.00.0.", "0.00.00.0."), + TAG_POINT_346("2C", "0.00.0.00", "0.00.0.00"), + TAG_POINT_1346("2D", "0.00.0.00.", "0.00.0.00."), + TAG_POINT_2346("2E", "0.00.0.0.0", "0.00.0.0.0"), + TAG_POINT_12346("2F", "0.00.0.0.0.", "0.00.0.0.0."), + TAG_POINT_56("30", "0.0.0000", "0.0.0000"), + TAG_POINT_156("31", "0.0.0000.", "0.0.0000."), + TAG_POINT_256("32", "0.0.000.0", "0.0.000.0"), + TAG_POINT_1256("33", "0.0.000.0.", "0.0.000.0."), + TAG_POINT_356("34", "0.0.00.00", "0.0.00.00"), + TAG_POINT_1356("35", "0.0.00.00.", "0.0.00.00."), + TAG_POINT_2356("36", "0.0.00.0.0", "0.0.00.0.0"), + TAG_POINT_12356("37", "0.0.00.0.0.", "0.0.00.0.0."), + TAG_POINT_456("38", "0.0.0.000", "0.0.0.000"), + TAG_POINT_1456("39", "0.0.0.000.", "0.0.0.000."), + TAG_POINT_2456("3A", "0.0.0.00.0", "0.0.0.00.0"), + TAG_POINT_12456("3B", "0.0.0.00.0.", "0.0.0.00.0."), + TAG_POINT_3456("3C", "0.0.0.0.00", "0.0.0.0.00"), + TAG_POINT_13456("3D", "0.0.0.0.00.", "0.0.0.0.00."), + TAG_POINT_23456("3E", "0.0.0.0.0.0", "0.0.0.0.0.0"), + TAG_POINT_123456("3F", "0.0.0.0.0.0.", "0.0.0.0.0.0."); + + private String code; + private String value; + private String description; + + TAG_LED_POINT_CMD(String code, String value, String description) { + this.code = code; + this.value = value; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].code; + } + } + return tmp; + } + } + + /** + * 标签控制器子命令枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAG_CONTROL_CHILD_CMD { + CHILD_CMD_00H("00", "在标签上显示字母数字(备注)"), + CHILD_CMD_01H("01", "关闭标签所有字符/清除缓冲区中的所有显示"), + CHILD_CMD_02H("02", "打开灯光指示器"), + CHILD_CMD_03H("03", "关闭灯光指示器"), + CHILD_CMD_04H("04", "蜂鸣器打开"), + CHILD_CMD_05H("05", "蜂鸣器关闭"), + CHILD_CMD_06H("06", "按钮返回确认消息"), + CHILD_CMD_07H("07", "按下按钮返回缺货信息"), + CHILD_CMD_08H("08", "设置最大地址轮询值"), + CHILD_CMD_09H("09", "连接的现场设备的返回状态"), + CHILD_CMD_0AH("0A", "现场设备超时"), + CHILD_CMD_0BH("0B", "查询设备故障，返回设备故障"), + CHILD_CMD_0CH("0C", "设备无法执行命令"), + CHILD_CMD_0DH("0D", "返回按钮锁定消息 (只有在从本机发送消息到设备后才激活)"), + CHILD_CMD_FCH("FC", "设备重置 OK，获取设备详细信息，返回设备的详细信息(与重置 OK 相同)"), + CHILD_CMD_0FH("0F", "返回库存模式下的缺货量"), + CHILD_CMD_10H("10", "在标签上闪烁字母数字"), + CHILD_CMD_11H("11", "指示灯闪烁"), + CHILD_CMD_12H("12", "设置闪烁时间间隔"), + CHILD_CMD_13H("13", "显示标签地址"), + CHILD_CMD_14H("14", "重置设备"), + CHILD_CMD_15H("15", "禁用缺货按钮"), + CHILD_CMD_16H("16", "启用缺货按钮"), + CHILD_CMD_17H("17", "模拟确认按钮"), + CHILD_CMD_18H("18", "模拟缺货按键"), + CHILD_CMD_19H("19", "切换为盘点模式"), + CHILD_CMD_1AH("1A", "切换为拣货模式"), + CHILD_CMD_1BH("1B", "禁用确认键"), + CHILD_CMD_1CH("1C", "启用确认和缺货按钮"), + CHILD_CMD_1EH("1E", "设置计数位"), + CHILD_CMD_1FH("1F", "设置标签多个配置"), + CHILD_CMD_3AH("3A", "设置设备地址"), + CHILD_CMD_64H("64", "设备返回"), + CHILD_CMD_FAH("FA", "获取设备的 F/W 模型信息，返回设备的 F/W 模型信息"), + CHILD_CMD_F7H("F7", "获取/启用/禁用警报自动蜂鸣器功能,获取/启用/禁用报警自动报告模式"); + + private String code; + private String description; + + TAG_CONTROL_CHILD_CMD(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + } + + /** + * 标签显示器亮灯颜色枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAG_LIGHT_COLOR_CMD { + TAG_LIGHT_COLOR_RED("00", "红"), + TAG_LIGHT_COLOR_GREEN("01", "绿"), + TAG_LIGHT_COLOR_ORANGE("02", "橙"), + TAG_LIGHT_COLOR_BLUE("03", "蓝"), + TAG_LIGHT_COLOR_PINK_RED("04", "粉红"), + TAG_LIGHT_COLOR_BLUE_GREEN("05", "蓝绿"); + + private String code; + private String description; + + TAG_LIGHT_COLOR_CMD(String code, String description) { + this.code = code; + this.description = description; + } + + public static TAG_LIGHT_COLOR_CMD getByValue(String code) { + for (TAG_LIGHT_COLOR_CMD tagLightColorCmd : values()) { + if (tagLightColorCmd.getCode() == code) { + return tagLightColorCmd; + } + } + return null; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + } + + /** + * 标签亮灯方式枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAG_LIGHT_TYPE { + TAG_LIGHT_TYPE_LIGHT(10, "常亮"), + TAG_LIGHT_TYPE_TWINKLE(20, "闪烁"); + + private int value; + private String description; + + TAG_LIGHT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + } + + /** + * 完成器音乐枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINISH_TAG_LIGHT_MUSIC_CMD { + FINISH_TAG_LIGHT_MUSIC_00H("00", "Jingle bells"), + FINISH_TAG_LIGHT_MUSIC_01H("01", "Carmen"), + FINISH_TAG_LIGHT_MUSIC_02H("02", "Happy Chinese new year"), + FINISH_TAG_LIGHT_MUSIC_03H("03", "Edelweiss"), + FINISH_TAG_LIGHT_MUSIC_04H("04", "Going home"), + FINISH_TAG_LIGHT_MUSIC_05H("05", "PAPALA"), + FINISH_TAG_LIGHT_MUSIC_06H("06", "Classical"), + FINISH_TAG_LIGHT_MUSIC_07H("07", "Listen to the rhythm of the falling rain"), + FINISH_TAG_LIGHT_MUSIC_08H("08", "Rock and roll"), + FINISH_TAG_LIGHT_MUSIC_09H("09", "Happy birthday"), + FINISH_TAG_LIGHT_MUSIC_0AH("0A", "Do Re Me"), + FINISH_TAG_LIGHT_MUSIC_0BH("0B", "Strauss"); + + private String code; + private String description; + + FINISH_TAG_LIGHT_MUSIC_CMD(String code, String description) { + this.code = code; + this.description = description; + } + + public static FINISH_TAG_LIGHT_MUSIC_CMD getByValue(String code) { + for (FINISH_TAG_LIGHT_MUSIC_CMD finishTagLightMusicCmd : values()) { + if (finishTagLightMusicCmd.getCode() == code) { + return finishTagLightMusicCmd; + } + } + return null; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + } + + /** + * 完成器音量枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINISH_TAG_LIGHT_VOLUME_CMD { + FINISH_TAG_LIGHT_VOLUME_00H("00", "0"), + FINISH_TAG_LIGHT_VOLUME_01H("01", "1"), + FINISH_TAG_LIGHT_VOLUME_02H("02", "2"), + FINISH_TAG_LIGHT_VOLUME_03H("03", "3"), + FINISH_TAG_LIGHT_VOLUME_04H("04", "4"), + FINISH_TAG_LIGHT_VOLUME_05H("05", "5"), + FINISH_TAG_LIGHT_VOLUME_06H("06", "6"), + FINISH_TAG_LIGHT_VOLUME_07H("07", "7"), + FINISH_TAG_LIGHT_VOLUME_08H("08", "8"), + FINISH_TAG_LIGHT_VOLUME_09H("09", "9"), + FINISH_TAG_LIGHT_VOLUME_0AH("0A", "10"), + FINISH_TAG_LIGHT_VOLUME_0BH("0B", "11"), + FINISH_TAG_LIGHT_VOLUME_0CH("0C", "12"), + FINISH_TAG_LIGHT_VOLUME_0DH("0D", "13"), + FINISH_TAG_LIGHT_VOLUME_0EH("0E", "14"), + FINISH_TAG_LIGHT_VOLUME_0FH("0F", "15"); + + private String code; + private String description; + + FINISH_TAG_LIGHT_VOLUME_CMD(String code, String description) { + this.code = code; + this.description = description; + } + + public static FINISH_TAG_LIGHT_VOLUME_CMD getByValue(String code) { + for (FINISH_TAG_LIGHT_VOLUME_CMD finishTagLightVolumeCmd : values()) { + if (finishTagLightVolumeCmd.getCode() == code) { + return finishTagLightVolumeCmd; + } + } + return null; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RouteEvent { + TRIGGER(10, "trigger", "触发"), + ENTRY(20, "entry", "进入状态"), + EXIT(30, "exit", "离开状态"); + + private int value; + private String code; + private String description; + + RouteEvent(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RouteState { + START(10, "START", "开启流程"), + TERMINATE(20, "TERMINATE", "终止流程"), + FINISH(30, "FINISH", "结束流程"); + + private int value; + private String code; + private String description; + + RouteState(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TagType { + BIN_TAG(10, "库位标签"), + FINALIZER_TAG(20, "完成器标签"), + SCREEN_TAG(30, "标签显示器"), + TAG_SCAN_API(40, "标签扫描接口"); + + private int value; + private String description; + + TagType(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TriggerType { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + TriggerType(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RouteType { + GEN_TASK(10, "GEN_TASK", "生成任务"), + OFF_TAG(20, "OFF_TAG", "灭灯"); + + private int value; + private String code; + private String description; + + RouteType(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MonitorProcessMessageType { + CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), + LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), + LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "", "灭灯命令"), + CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), + INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"); + + private int value; + private String code; + private String callClass; + private String description; + + MonitorProcessMessageType(int value, String code, String callClass, String description) { + this.value = value; + this.code = code; + this.callClass = callClass; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getCallClass() { + return callClass; + } + + public String getDescription() { + return description; + } + + public static MonitorProcessMessageType getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (MonitorProcessMessageType enums : MonitorProcessMessageType.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum InterfaceSignalMessageType { + CONNECT_CONTROL_CMD(10, "111111", "connectControlService", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "222222", "disconnectControlService", "断开控制器"), + LIGHT_ON_CMD(30, "333333", "lightOnService", "亮灯命令"); + + private int value; + private String code; + private String callClass; + private String description; + + InterfaceSignalMessageType(int value, String code, String callClass, String description) { + this.value = value; + this.code = code; + this.callClass = callClass; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCallClass() { + return callClass; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static InterfaceSignalMessageType getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WsBusiType { + MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"); + + private int value; + private String code; + private String description; + + WsBusiType(int value, String code, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WsDataType { + TEXT(10, "TEXT", "正常信息"), + EXP_TEXT(20, "EXP_TEXT", "异常信息"), + TABLE(30, "TABLE", "表格"); + + private int value; + private String code; + private String description; + + WsDataType(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum StatusType { + START(10, "START", "开始状态"), + FINISH(20, "FINISH", "完成状态"), + TERMINATE(30, "TERMINATE", "中断状态"); + + private int value; + private String code; + private String description; + + StatusType(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + +} 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 e618c9d..0d3696a 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 @@ -174,6 +174,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 主表信息 单据类型 */ @@ -700,9 +701,9 @@ public class WmsEnumUtil { 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", "坤泰拣货"), - PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"), - UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用"); + KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), + PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), + UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"); private int value; private String code; @@ -736,6 +737,16 @@ public class WmsEnumUtil { return tmp; } + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -887,7 +898,7 @@ public class WmsEnumUtil { VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PICK_RC("KT_PICK_RC", "坤泰拣货"), - UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用"); + UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"); private String value; private String description; @@ -1027,7 +1038,7 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), - SCRAP(70,"报废"), + SCRAP(70, "报废"), COMMING(80, "在途"); private int value; @@ -1253,6 +1264,46 @@ public class WmsEnumUtil { } } + /** + * 盘点主表 单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_STRATEGY_TYPE { + PART_COVERAGE(110, "物料分类覆盖"), + TOUCH(120, "动碰"), + ZORE_STOCK(130, "零库存"); + + private int value; + private String description; + + CS_STRATEGY_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + /** * 盘点主表 单据类型 */ @@ -1262,7 +1313,11 @@ public class WmsEnumUtil { MONTH_INVENTORY(20, "月度盘点"), SEASON_INVENTORY(30, "季度盘点"), YEAR_INVENTORY(40, "年度盘点"), - AJUST_INVENTORY(50, "库存调整盘点"); + AJUST_INVENTORY(50, "库存调整盘点"), + PART_COVERAGE(110, "物料分类覆盖"), + TOUCH(120, "动碰"), + ZORE_STOCK(130, "零库存"); + private int value; private String description; @@ -1460,6 +1515,7 @@ public class WmsEnumUtil { return valueOf(val); } } + /** * 库存移动单状态状态:10=新建,20=已处理,30=处理出错 */ @@ -2107,7 +2163,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMMON_SN { PO_SN("PO_SN", "PO条码"), - VDA_SN("VDA_SN", "VDA条码"); + VDA_SN("VDA_SN", "VDA条码"), + SELF_SN("SELF_SN", "自制件条码"); private String code; private String description; @@ -2925,64 +2982,56 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IMPORT_ORDER_TYPE { - PO("PO", "要货计划"), - ASN("ASN", "ASN"), - INSTRUCTIONS("INSTRUCTIONS", "指令"), - SCATTERED_OUT("C00", "零星出库指令"), - SCATTERED_INT("C01", "零星入指令"), - NC_DISMANTLING_PICKING("C02", "NC拆解领料"), - NC_DISMANTLING_RETURN("C03", "NC拆解退料"), - NC_SCRAPPED("C04", "NC报废指令"), - NOT_JIS("NOTJIS", "非JIS指令"), - STOCK_DUMP("D00", "库存转储指令"), - NC_INSTOCK("D01", "NC入库指令"), - SMRR("B00", "SMRR退货"), - DMR("B01", "DMR退货"), - OUT_SOURCING("A00", "委外发料指令"), - OUT_REBACK("A01", "委外退料指令"), - OUT_RETURN_SOURCING("A02", "委外返工发料指令"), - OUT_RETURN_("A03", "委外返工退料指令"), - SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"), - CS("CS", "盘点指令"), - CS_ADUJUST("CS_ADUJUST", "盘点调差指令"); + PO("1", "PO", "要货计划"), + ASN("2", "ASN", "ASN"), + INSTRUCTIONS("3", "INSTRUCTIONS", "指令"), + SCATTERED_OUT("C00", "C00", "零星出库指令"), + SCATTERED_INT("C01", "C01", "零星入指令"), + NC_DISMANTLING_PICKING("C02", "C02", "NC拆解领料"), + NC_DISMANTLING_RETURN("C03", "C03", "NC拆解退料"), + NC_SCRAPPED("C04", "C04", "NC报废指令"), + NOT_JIS("NOTJIS", "NOTJIS", "非JIS指令"), + STOCK_DUMP("D00", "D00", "库存转储指令"), + NC_INSTOCK("D01", "D01", "NC入库指令"), + SMRR("B00", "B00", "SMRR退货"), + DMR("B01", "B01", "DMR退货"), + OUT_SOURCING("A00", "A00", "委外发料指令"), + OUT_REBACK("A01", "A01", "委外退料指令"), + OUT_RETURN_SOURCING("A02", "A02", "委外返工发料指令"), + OUT_RETURN_("A03", "A03", "委外返工退料指令"), + SALES_RETURN_REBACK("SALES_RETURN", "SALES_RETURN", "销售退货指令"), + CS("CS", "CS", "盘点指令"), + CS_ADUJUST("CS_ADUJUST", "CS_ADUJUST", "盘点调差指令"); private String value; + private String code; private String description; - IMPORT_ORDER_TYPE(String value, String description) { + IMPORT_ORDER_TYPE(String value, String code, String description) { this.value = value; + this.code = code; this.description = description; } - public String getDescription() { - return description; + public String getValue() { + return value; } public String getCode() { - return value; + return code; } - public String getValue() { - return value; + public String getDescription() { + return description; } - public static IMPORT_ORDER_TYPE codeOf(String value) { + public static IMPORT_ORDER_TYPE codeOf(String code) { for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(value)) { + if (values()[i].code.equals(code)) { return values()[i]; } } return null; } - - public static String getDes(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } } /** @@ -3072,7 +3121,6 @@ public class WmsEnumUtil { } - /** * 任务数据来源：检查子数据 */ @@ -3485,7 +3533,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码"); + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); private int value; private String description; @@ -4477,8 +4525,8 @@ public class WmsEnumUtil { WAIT_RECEIVING(10, "待收货"), RECEIVING(20, "收货中"), COMPLETE_RECEIVING(30, "收货完成"), - CLOSE(40,"已关闭"), - CANCEL(50,"已取消"), + CLOSE(40, "已关闭"), + CANCEL(50, "已取消"), UN_RECEIVED(60, "延迟未收货"); private int value; @@ -4569,9 +4617,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_ORDER_MASTER_STATUS { - CREATE(10,"CREATE", "创建"), - PLANNED(20,"PLANNED", "已计划"), - CLOSE(30,"CLOSE", "已关闭"); + CREATE(10, "CREATE", "创建"), + PLANNED(20, "PLANNED", "已计划"), + CLOSE(30, "CLOSE", "已关闭"); private int value; private String code; @@ -4657,8 +4705,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PULL_TASK_DETAILS_STATUS { - BE_HANDLE(10,"BE_HANDLE", "待处理"), - CANCELLATION(20,"CANCELLATION", "已处理"); + BE_HANDLE(10, "BE_HANDLE", "待处理"), + CANCELLATION(20, "CANCELLATION", "已处理"); private int value; private String code; @@ -4709,10 +4757,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PULL_TASK_MASTER_STATUS { - CREATE(10,"CREATE", "创建"), - ENABLED(20,"ENABLED", "已启动"), - COMPLETE(30,"COMPLETE", "已完成"), - CLOSE(40,"CLOSE", "已关闭"); + CREATE(10, "CREATE", "创建"), + ENABLED(20, "ENABLED", "已启动"), + COMPLETE(30, "COMPLETE", "已完成"), + CLOSE(40, "CLOSE", "已关闭"); private int value; private String code; @@ -4793,8 +4841,8 @@ public class WmsEnumUtil { } /** - * WEB页面字段类型 - * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 + * WEB页面字段类型 + * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FIELD_TYPE { @@ -4864,4 +4912,119 @@ public class WmsEnumUtil { } } + + /** + * 流程提交类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_COMMIT_MODE { + JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), REF_GROUP(30, 30, "关联分组号提交"); + + private int value; + private int code; + private String description; + + GROUP_COMMIT_MODE(int value, int code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public int getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 自定义列表：优先级 (CUSTOMIZE_PROP) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CUSTOMIZE_PROP { + DEFAULT(1, "默认"), CUSTOMIZE(2, "自定义"); + private int value; + private String description; + + CUSTOMIZE_PROP(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 领料看板执行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PICKING_EXECUTE_STATUS { + IN_PROGRESS(1, "执行中"), EXPIRED(2, "已超期"), NORMAL(3, "正常"); + + private int value; + private String description; + + PICKING_EXECUTE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 3bd0c51..3009cfa 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -266,6 +266,18 @@ public class DdlPreparedPack { } /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val); + } + } + + /** * 封装String对象成不等于语句 * * @param columnName 列名 @@ -321,6 +333,15 @@ public class DdlPreparedPack { } /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param packBean + */ + public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackBean packBean) { + packBean.addColumnQuery(null, " and UPPER(model." + firstColumnName + ")!= UPPER(model." + twoColumnName+")", null); + } + /** * 封装long或者int的负整数对象成equal语句 * * @param columnName 列名 @@ -577,7 +598,7 @@ public class DdlPreparedPack { */ public static void getNotInPackList(List data, String columnName, DdlPackBean packBean) { if (data != null && data.size() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + "not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and model." + columnName + " not in (:m_" + columnName + ")", data); } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index a102246..0ca9d53 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -119,6 +119,14 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "控件引用RefKey") private String propertyControlRefKey; + @Column(name = "PROPERTY_CONTROL_TEXT_KEY") + @ApiParam(value = "控件显示文本Key") + private String propertyControlTextKey; + + @Column(name = "PROPERTY_CONTROL_VALUE_KEY") + @ApiParam(value = "控件引用值Key") + private String propertyControlValueKey; + @Column(name = "PROPERTY_DESCRIPTION") @ApiParam(value = "属性描述") private String propertyDescription; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 8fd5bbc..1c73450 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -146,6 +146,10 @@ public class LacSuitTask extends BaseBean { private List lacSuitTaskParamList; @Transient + @ApiParam(value ="适配出参") + private List lacSuitTaskOutParamList; + + @Transient @ApiParam(value ="入参适配") private List inputParamAdapterList; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index 697b68e..76e34fa 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -96,4 +96,11 @@ public class LacSuitTaskParam extends BaseBean { @Transient @ApiParam(value ="参数值") private Object value; + + public String getValueStr() { + if (value == null) { + return null; + } + return value.toString(); + } } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 10b2e48..fdf9175 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -119,6 +119,10 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + if(bean!=null) { + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getParamName(), "paramName", ddlPackBean); + } return ddlPackBean; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java index 9118124..eb147e3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; import java.math.BigDecimal; /** @@ -27,8 +28,9 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_DISMENTLE_RECORD") @Api("物料拆解表") -public class IfDismantleRecord extends BaseBean { +public class IfDismantleRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -6010207359066736962L; @Column(name = "DISMANTLE_ID") @ApiParam("拆解编号") private String dismantleId; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java index cf17f2d..5e7684b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PACKAGE_DETAIL") @Api("包装明细表") -public class IfPackageDetail extends BaseBean { +public class IfPackageDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -1873101288426218272L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java index 23e442e..367bb1c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") @Api("生产报工表") -public class IfProductOffLine extends BaseBean { +public class IfProductOffLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 200629529131241418L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java index df5d1dc..ac19407 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION") @Api("mes系统业务动作") -public class MesAction extends BaseBean { +public class MesAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -6451213228967727835L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java index c1c1a82..eafb489 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION_IF") @Api("动作接口配置") -public class MesActionIf extends BaseBean { +public class MesActionIf extends BaseBean implements Serializable { + private static final long serialVersionUID = -5058215339453766620L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java index a6ab494..b38452f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作方法 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION_METHOD") @Api("系统业务动作方法") -public class MesActionMethod extends BaseBean { +public class MesActionMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = 6249418690993577108L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java index 00732f2..85de33f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :生产区域 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_AREA") @Api("生产区域") -public class MesArea extends BaseBean { +public class MesArea extends BaseBean implements Serializable { + private static final long serialVersionUID = 1047604067591557689L; @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java index e8245d3..7471095 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java @@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :BOM清单 @@ -29,7 +30,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BOM") @Api("BOM清单") -public class MesBom extends BaseBean { +public class MesBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -1772273641263268564L; @Column(name = "PART_NO") @ApiParam("父零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java index b73cd80..60e2d1d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java @@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; +import java.io.Serializable; /** * @Description :工位投料信息 @@ -27,7 +29,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CELL_FEED") @Api("工位投料信息") -public class MesCellFeed extends BaseBean { +public class MesCellFeed extends BaseBean implements Serializable { + private static final long serialVersionUID = 2412657464618960515L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -64,6 +67,11 @@ public class MesCellFeed extends BaseBean { @ApiParam("供应商代码") private String supplierCode; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java index 022e20c..f8b9558 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :配置表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONFIG") @Api("mes配置表") -public class MesConfig extends BaseBean { +public class MesConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = -5759669472714287000L; @Column(name = "CFG_CODE") @ApiParam("配置代码") private String cfgCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java index 3a8061e..8e9a363 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUST_PROD_LINE") @Api("客户产线代码") -public class MesCustProdLine extends BaseBean { +public class MesCustProdLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 3049432665592161513L; @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java index 75178c5..21f2ad1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes客户表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER") @Api("客户信息") -public class MesCustomer extends BaseBean { +public class MesCustomer extends BaseBean implements Serializable { + private static final long serialVersionUID = 167635887082538926L; @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java index 0a93045..0c5f49c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes客户表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER_PART") @Api("客户零件关系") -public class MesCustomerPart extends BaseBean { +public class MesCustomerPart extends BaseBean implements Serializable { + private static final long serialVersionUID = -4731252848471949263L; @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java index 015d53e..8bded7d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DATA_OBJECT") @Api("数据对象") -public class MesDataObject extends BaseBean { +public class MesDataObject extends BaseBean implements Serializable { + private static final long serialVersionUID = -1419262751765770535L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java index 597b60a..93ea185 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DATASOURCE") @Api("地址清单") -public class MesDatasource extends BaseBean { +public class MesDatasource extends BaseBean implements Serializable { + private static final long serialVersionUID = -7387559860198655900L; @Column(name = "DS_CODE") @ApiParam("数据源代码") private String dsCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java index c91d9c7..2214411 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -28,8 +29,9 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DEFECT") @Api("缺陷表") -public class MesDefect extends BaseBean { +public class MesDefect extends BaseBean implements Serializable { + private static final long serialVersionUID = -6771813937279359333L; @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java index 5d312e2..d4f287f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DEFECT_CAUSE") @Api("缺陷原因表") -public class MesDefectCause extends BaseBean { +public class MesDefectCause extends BaseBean implements Serializable { + private static final long serialVersionUID = -3867250593038812861L; @Column(name = "DC_CODE") @ApiParam("缺陷原因代码") private String dcCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 2b6489c..a97ccef 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -28,7 +29,8 @@ import java.util.List; @Index(columnList = "CREATE_DATE_TIME") }) @Api("不良信息记录表") -public class MesDefectRecord extends BaseBean { +public class MesDefectRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2828208776424343584L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 209c69a..14151ff 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.math.BigDecimal; /** @@ -28,8 +29,9 @@ import java.math.BigDecimal; @Index(columnList = "CREATE_DATE_TIME") }) @Api("物料拆解记录表") -public class MesDismantleRecord extends BaseBean { +public class MesDismantleRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -7924346039878218038L; @Column(name = "DISMANTLE_ID") @ApiParam("拆解编号") private String dismantleId; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java index d80c3db..df432f3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :生产设备 @@ -30,7 +31,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQUIPMENT") @Api("生产设备") -public class MesEquipment extends BaseBean { +public class MesEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 7269069290035250108L; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; 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 index da30dc1..655c2f4 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 @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") -public class MesEsop extends BaseBean { +public class MesEsop extends BaseBean implements Serializable { + private static final long serialVersionUID = -4869646502033099294L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; 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 index 951539b..cc17b50 100644 --- 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务事件 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EVENT") @Api("系统业务事件") -public class MesEvent extends BaseBean { +public class MesEvent extends BaseBean implements Serializable { + private static final long serialVersionUID = -5604724665202938464L; @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; 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 index fe29e51..2a16eb0 100644 --- 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 @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务事件动作 @@ -31,7 +32,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EVENT_ACTION") @Api("系统业务事件动作") -public class MesEventAction extends BaseBean { +public class MesEventAction extends BaseBean implements Serializable { + private static final long serialVersionUID = 3964084375279916831L; @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java index 7df328e..f128453 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FI_CFG") @Api("首检件配置") -public class MesFiCfg extends BaseBean { +public class MesFiCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 1791614973371037158L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; 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 index eea9e56..a90ed92 100644 --- 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FILE") @Api("文件表") -public class MesFile extends BaseBean { +public class MesFile extends BaseBean implements Serializable { + private static final long serialVersionUID = 7017379708394714424L; @Column(name = "FILE_NAME") @ApiParam("文件名称") private String fileName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java index 96102ec..243e6a9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :物料关键数据 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KP_DATA") @Api("生产区域") -public class MesKpData extends BaseBean { +public class MesKpData extends BaseBean implements Serializable { + private static final long serialVersionUID = -3332582267186642790L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java index 73990e7..9ca9ac7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KPSN_RULE") @Api("关键件条码校验规则") -public class MesKpsnRule extends BaseBean { +public class MesKpsnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = 8238308232531730720L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java index 761a2f6..589c237 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -25,9 +26,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") -public class MesLabelTemplate extends BaseBean { +public class MesLabelTemplate extends BaseBean implements Serializable { - private static final long serialVersionUID = 5371856566557305323L; + + private static final long serialVersionUID = 3797103812377146878L; @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java index 63552ba..253f29a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 打印模板参数 @@ -26,9 +27,9 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") -public class MesLabelTemplateParam extends BaseBean { +public class MesLabelTemplateParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 6476163540527157643L; + private static final long serialVersionUID = -3595706874099358555L; @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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 index 0316985..e8daace 100644 --- 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务方法 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_METHOD") @Api("系统业务方法") -public class MesMethod extends BaseBean { +public class MesMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -3629909409034083767L; @Column(name = "METHOD_CODE") @ApiParam("方法代码") private String methodCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java new file mode 100644 index 0000000..3e81c47 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.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.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; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:11 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK") +@Api("监听任务") +public class MesMonitorTask extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8614480099840448294L; + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_OBJECT_TYPE") + @ApiParam("任务对象类型") + private Integer taskObjectType; + + @Column(name = "TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + + @Column(name = "TASK_EXCEPTION_DESC") + @ApiParam("异常描述") + private String taskExceptionDesc; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java new file mode 100644 index 0000000..891dc65 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java @@ -0,0 +1,48 @@ +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; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:19 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK_DETAIL") +@Api("监听任务明细") +public class MesMonitorTaskDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4811270359386960747L; + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "DATA_OBJECT_NO") + @ApiParam("数据对象编号") + private String dataObjectNo; + +// @Column(name = "STORE_OBJECT_CODE") +// @ApiParam("存储对象代码") +// private String storeObjectCode; +// +// @Column(name = "STORE_FIELD_CODE") +// @ApiParam("存储字段代码") +// private String storeFieldCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java index 9285d25..9fc51c2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_NUMBER_RULE") @Api("条码生成规则") -public class MesNumberRule extends BaseBean { +public class MesNumberRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -4039194855353751178L; @Column(name = "RULE_CODE") @ApiParam("规则代码") private String ruleCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java index 1abc81c..16436c6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java @@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_NUMBER_SERIALNO") @Api("编码序号") -public class MesNumberSerialno extends BaseBean { +public class MesNumberSerialno extends BaseBean implements Serializable { + private static final long serialVersionUID = -3024166851634742872L; @Column(name = "CURRENT_NUMBER_PREFIX") @ApiParam("当前编号前缀") private String currentNumberPrefix; @@ -38,4 +41,9 @@ public class MesNumberSerialno extends BaseBean { @Column(name = "CURRENT_NUMBER") @ApiParam("当前编号") private String currentNumber; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index fc8ee12..5b7c166 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_OBJECT_CFG") @Api("对象结构") -public class MesObjectCfg extends BaseBean { +public class MesObjectCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -3640782210450491835L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java index dcb2322..38c0363 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :PLC设备信息配置表 @@ -28,7 +29,8 @@ import javax.persistence.Table; @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") @Deprecated -public class MesPLCConfigure extends BaseBean { +public class MesPLCConfigure extends BaseBean implements Serializable { + private static final long serialVersionUID = 8274445475806774L; @Column(name = "IP") @ApiParam("设备ip") private String ipAddress; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java index 96f9229..7ca973d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :包装规格 @@ -28,7 +29,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACK_SPEC") @Api("包装规格") -public class MesPackSpec extends BaseBean { +public class MesPackSpec extends BaseBean implements Serializable { + private static final long serialVersionUID = -788654193624068327L; @Column(name = "SPEC_CODE") @ApiParam("包装规格代码") private String specCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 39d5e93..6c1beda 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -21,10 +22,15 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) + } +) @Api("包装规格") -public class MesPackage extends BaseBean { - @Column(name = "PACKAGE_NO") +public class MesPackage extends BaseBean implements Serializable { + private static final long serialVersionUID = 2292859018089339608L; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 88c635c..863a6fd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -9,10 +9,8 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -24,15 +22,20 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) + } +) @Api("包装规格明细") -public class MesPackageDetail extends BaseBean { +public class MesPackageDetail extends BaseBean implements Serializable { - @Column(name = "PACKAGE_NO") + private static final long serialVersionUID = 8162606304720621672L; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java index ddcdc82..72084e3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") -public class MesPackageTravel extends BaseBean { +public class MesPackageTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -2808747095415676213L; @Column(name = "PACKAGE_NO") @ApiParam("包装编码") private String packageNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java index 78b1e77..81365ef 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :物料信息 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART") @Api("物料信息") -public class MesPart extends BaseBean { +public class MesPart extends BaseBean implements Serializable { + private static final long serialVersionUID = 3936033255397936854L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java index af18170..949a02f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :零件种类 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_CATEGORY") @Api("零件种类") -public class MesPartCategory extends BaseBean { +public class MesPartCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = 9076081904146489470L; @Column(name = "CATEGORY_CODE") @ApiParam("分类代码") private String categoryCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 09b331d..9c8adca 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -11,7 +11,9 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运模式 @@ -27,8 +29,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesPatternJis extends BaseBean { +public class MesPatternJis extends BaseBean implements Serializable { + private static final long serialVersionUID = 1119289554542499312L; @Column(name = "PATTERN_NO") @ApiParam("模式编号") private String patternNo; @@ -37,28 +40,29 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; @Column(name = "PATTERN_DESC") @ApiParam("描述") private String patternDesc; - @Column(name = "TOP_NO") - @ApiParam("一次显示TOP数") - private Integer topNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; @Column(name = "PATTERN_TYPE") @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_TYPE") - @ApiParam("是否按主队列顺序扫描") - private Integer scanType; + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java index 247c8d9..c19bfa3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN") @Api("PCN节点") -public class MesPcn extends BaseBean { +public class MesPcn extends BaseBean implements Serializable { + private static final long serialVersionUID = -7570827672640277097L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java index aa394cc..faa7f92 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") -public class MesPcnConnectLog extends BaseBean { +public class MesPcnConnectLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -4153357131289178766L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java index e3e82aa..4d321f8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") -public class MesPcnSyncCfg extends BaseBean { +public class MesPcnSyncCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -6869288362923390521L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java index 8ea5d25..a82b8d4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYNC_ERRORLOG") @Api("MES_PCN同步异常日志") -public class MesPcnSyncErrorLog extends BaseBean { +public class MesPcnSyncErrorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -2249754641660006488L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index 53fad7f..78d3caa 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -27,8 +28,9 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYS_USER_OFFLINE") @Api(value = "账号离线登陆表", description = "账号离线登陆表。") -public class MesPcnSysUserOffline extends BaseBean { +public class MesPcnSysUserOffline extends BaseBean implements Serializable { + private static final long serialVersionUID = 7617353154826718154L; @Column(name = "USER_ID") @ApiParam(value = "人员ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java index 0160b54..8288401 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes-pcn定时任务工作清单 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") -public class MesPcnTask extends BaseBean { +public class MesPcnTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 4777357978430670966L; @Column(name = "TASK_CODE") @ApiParam("任务代码") private String taskCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java index c46fe73..f0ee69f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes-pcn定时任务工作清单同步记录 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_TASK_LOG") @Api("mes-pcn定时任务工作清单同步记录") -public class MesPcnTaskLog extends BaseBean { +public class MesPcnTaskLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -784806389462540310L; @Column(name = "SYNC_TIME_START") @ApiParam("同步数据开始时间") private String syncTimeStart; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java index ff1c82d..bb60da6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -23,10 +24,15 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) + } +) @Api("生产主计划") -public class MesPlanOrder extends BaseBean { - @Column(name = "ORDER_NO") +public class MesPlanOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 8571104279843276872L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 2f172df..cb03681 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC") @Api("PLC配置表") -public class MesPlc extends BaseBean { +public class MesPlc extends BaseBean implements Serializable { + private static final long serialVersionUID = -5346536604317095818L; @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; @@ -96,6 +98,10 @@ public class MesPlc extends BaseBean { @ApiParam("反馈值") private String feedValue; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java index 2a88530..752400b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工序 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROCESS") @Api("工序") -public class MesProcess extends BaseBean { +public class MesProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = -2619648674238082872L; @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index 984e6d6..8114387 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :产品绑定记录表 @@ -28,7 +29,8 @@ import javax.persistence.*; @Index(columnList = "KP_SN") }) @Api("产品绑定记录表") -public class MesProdBindRecord extends BaseBean { +public class MesProdBindRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -4319604821328717354L; @Column(name = "SERIAL_NUMBER") @ApiParam(value = "产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java index 5ac78dc..4ff20da 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品配置 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG") @Api("产品配置") -public class MesProdCfg extends BaseBean { +public class MesProdCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 7487874316722319947L; @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java index cbb3f3d..fd4cf72 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :产品配置明细 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG_DETAIL") @Api("产品配置明细") -public class MesProdCfgDetail extends BaseBean { +public class MesProdCfgDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -8362302529703401583L; @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java index 18efe0e..a68bcec 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_PACK") @Api("产品包装关系") -public class MesProdPack extends BaseBean { +public class MesProdPack extends BaseBean implements Serializable { + private static final long serialVersionUID = -2621135811864108025L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java index d345465..4e8c76d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品类流程配置表 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_ROUTE_CFG") @Api("产品类流程配置表") -public class MesProdRouteCfg extends BaseBean { +public class MesProdRouteCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -3768632071281056796L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java index effd957..169af24 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品流程配置操作参数表 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_ROUTE_OPT_PARAM") @Api("产品流程配置操作参数表") -public class MesProdRouteOptParam extends BaseBean { +public class MesProdRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -932364659894292000L; @Column(name = "PROD_ROUTE_CFG_ID") @ApiParam("产品流程ID") private Long prodRouteCfgId; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java index 131674e..5520632 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CATEGORY") @Api("系统业务动作") -public class MesProduceCategory extends BaseBean { +public class MesProduceCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = 4593983703007675620L; @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCategoryCode; 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 984b9bf..aeda2b0 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 @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CTGY_PICTURE") @Api("产品类型图片表") -public class MesProduceCtgyPicture extends BaseBean { +public class MesProduceCtgyPicture extends BaseBean implements Serializable { + private static final long serialVersionUID = -7223382567320219332L; @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCtgyCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 6eb2592..5e3440d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -24,16 +24,18 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) + } +) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = 6641051790330191326L; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; @@ -124,6 +126,11 @@ public class MesProduceSn extends BaseBean implements Serializable { @Column(name = "TRAY_NO") @ApiParam("托盘号") private String trayNo; +// +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public transient Integer lockVersion; @Transient @ApiParam("返回信息") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index 7a17c7d..5d8ce41 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 产品条码履历实体类 @@ -29,7 +30,8 @@ import javax.persistence.*; @Index(columnList = "MODIFY_DATE_TIME") }) @Api("产品条码履历表") -public class MesProduceSnTravel extends BaseBean { +public class MesProduceSnTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -1692487592284871549L; @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 5bd3895..600bfc2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :生产数据 @@ -30,7 +31,8 @@ import javax.persistence.*; @Index(columnList = "MODIFY_DATE_TIME") }) @Api("生产数据") -public class MesProductData extends BaseBean { +public class MesProductData extends BaseBean implements Serializable { + private static final long serialVersionUID = -2365404168777050771L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -100,8 +102,8 @@ public class MesProductData extends BaseBean { private String groupNo; @Lob - @Column(name = "TEST_DATA") - @ApiParam("测试json数据") - private String testData; + @Column(name = "LINE_DATA") + @ApiParam("生产数据") + private String lineData; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 20fa8b6..b5b9fa2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -28,8 +29,9 @@ import java.util.List; @Index(columnList = "SN") }) @Api("质量过程检测数据") -public class MesQcCheckData extends BaseBean { +public class MesQcCheckData extends BaseBean implements Serializable { + private static final long serialVersionUID = 3600528549583720850L; @Column(name = "CHECK_ID") @ApiParam("检测id") private String checkId; 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 9226c3a..be9bfe8 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 @@ -12,6 +12,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; +import java.util.List; /** * @Description: @@ -27,8 +29,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") -public class MesQcCheckStandard extends BaseBean { +public class MesQcCheckStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 1590320231495124712L; @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; @@ -77,10 +80,18 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测项类型") private String checkItemType; + @Transient + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + @Transient + private List childQcList; + public MesQcCheckStandard() { } - public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { this.id = id; this.partNo = partNo; this.workCenterCode = workCenterCode; @@ -92,5 +103,6 @@ public class MesQcCheckStandard extends BaseBean { this.checkFrequency = checkFrequency; this.partName = partName; this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java index b833dfc..7d4bd81 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :JIS发运队列 @@ -27,8 +29,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_JIS") @Api("JIS发运队列") -public class MesQueueJis extends BaseBean { +public class MesQueueJis extends BaseBean implements Serializable { + private static final long serialVersionUID = 8028683333028906395L; @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; @@ -61,4 +64,8 @@ public class MesQueueJis extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Transient + @ApiParam("颜色") + private String color; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java index e8243ed..ef3b7d1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运队列明细 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_JIS_DETAIL") @Api("JIS发运队列明细") -public class MesQueueJisDetail extends BaseBean { +public class MesQueueJisDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 829273008952400763L; @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; @@ -49,6 +51,10 @@ public class MesQueueJisDetail extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "FINAL_STATUS") + @ApiParam("明细整体状态") + private Integer finalStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index c098cd9..c8dcab7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -24,10 +25,14 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER", indexes = { @Index(columnList = "CUST_FLAG_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) + } +) @Api("生产队列主表") -public class MesQueueOrder extends BaseBean { - @Column(name = "ORDER_NO") +public class MesQueueOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 6538031118299400711L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index f058270..a266608 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -24,14 +25,18 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + } +) @Api("生产队列明细") -public class MesQueueOrderDetail extends BaseBean { - @Column(name = "ORDER_NO") +public class MesQueueOrderDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 1548933241804083457L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java index b9d4630..3f3458c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -28,7 +29,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") -public class MesRawPartSn extends BaseBean { +public class MesRawPartSn extends BaseBean implements Serializable { + private static final long serialVersionUID = 5504323561257182116L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java index 9753ac8..785f350 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :维修 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_REPAIR") @Api("维修") -public class MesRepair extends BaseBean { +public class MesRepair extends BaseBean implements Serializable { + private static final long serialVersionUID = -7520365696308295804L; @Column(name = "REPAIR_CODE") @ApiParam("维修代码") private String repairCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java index e6974e9..e6da731 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -28,8 +29,9 @@ import java.util.List; @Index(columnList = "CREATE_DATE_TIME") }) @Api("维修信息记录表") -public class MesRepairRecord extends BaseBean { +public class MesRepairRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2453726410779076150L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java index 6838d51..f8b2802 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :流程表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE") @Api("流程表") -public class MesRoute extends BaseBean { +public class MesRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = -7622507229961050740L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java index 6dd7933..11ba452 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :流程工序关系 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS") @Api("流程工序关系") -public class MesRouteProcess extends BaseBean { +public class MesRouteProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = 3477334942090180010L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java index d531539..b1da58f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工序工作单元 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS_CELL") @Api("工序工作单元对照") -public class MesRouteProcessCell extends BaseBean { +public class MesRouteProcessCell extends BaseBean implements Serializable { + private static final long serialVersionUID = -703779336699805482L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java index c42611a..a77b075 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :报废原因 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SCRAP") @Api("报废原因") -public class MesScrap extends BaseBean { +public class MesScrap extends BaseBean implements Serializable { + private static final long serialVersionUID = -6202113707752178624L; @Column(name = "SCRAP_CODE") @ApiParam("报废代码") private String scrapCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index f7cad22..97ac5d3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -29,8 +30,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("报废信息记录表") -public class MesScrapRecord extends BaseBean { +public class MesScrapRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -8519832449647086195L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java index 89cad0e..13874ae 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT") @Api("班次信息") -public class MesShift extends BaseBean { +public class MesShift extends BaseBean implements Serializable { + private static final long serialVersionUID = -1174268061355263705L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java index 9af574d..7aac2d7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT_GROUP") @Api("班组") -public class MesShiftGroup extends BaseBean { +public class MesShiftGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 8962836866086379111L; @Column(name = "GROUP_CODE") @ApiParam("班组代码") private String groupCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java index 5c7dad6..9b5cd41 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT_REST") @Api("班次休息信息") -public class MesShiftRest extends BaseBean { +public class MesShiftRest extends BaseBean implements Serializable { + private static final long serialVersionUID = -8712815093203320523L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java index 36a7f61..b376b32 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :工序物料清单 @@ -29,7 +30,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STATION_BOM") @Api("工序物料清单") -public class MesStationBom extends BaseBean { +public class MesStationBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -4693067673094931011L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java index 76c3318..0998015 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :工步 @@ -27,7 +28,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STEP") @Api("工步") -public class MesStep extends BaseBean { +public class MesStep extends BaseBean implements Serializable { + private static final long serialVersionUID = -2157306767211269786L; @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java index 1c938ef..dd5a834 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工步参数 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STEP_PARAM") @Api("工步参数") -public class MesStepParam extends BaseBean { +public class MesStepParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -147541368320233093L; @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java new file mode 100644 index 0000000..47c1867 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java @@ -0,0 +1,40 @@ +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; +import java.io.Serializable; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TIME") +@Api("工步参数") +public class MesTime extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1562011791394529076L; + @Column(name = "MODULE") + @ApiParam("组件") + private String module; + + @Column(name = "ELAPSE") + @ApiParam("耗时") + private Long elapse; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java index cac23de..43a0b61 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :扭矩信息记录表 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") -public class MesTorqueDetail extends BaseBean { +public class MesTorqueDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 2900363253333046861L; @Column(name = "SN") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java index d7e20a0..b7d0b46 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_TYPE_CFG") @Api("类型信息表") -public class MesTypeCfg extends BaseBean { +public class MesTypeCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -1699612238800419597L; @Column(name = "TYPE_CODE") @ApiParam("类型代码") private String typeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java index 0160465..f958bd1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WC_CHECK") @Api("开线检查") -public class MesWcCheck extends BaseBean { +public class MesWcCheck extends BaseBean implements Serializable { + private static final long serialVersionUID = 8057329890155185557L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java index a5e339d..e03e8e2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -28,8 +29,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("开线检查记录") -public class MesWcCheckRecord extends BaseBean { +public class MesWcCheckRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2173902677953303765L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java index 6a2aa0d..feeef17 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,7 +26,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WC_EQUIPMENT") @Api("工作单元设备关系表") -public class MesWcEquipment extends BaseBean { +public class MesWcEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 2088600237918553286L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java index efd99e5..d6740f7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工作单元 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL") @Api("工作单元") -public class MesWorkCell extends BaseBean { +public class MesWorkCell extends BaseBean implements Serializable { + private static final long serialVersionUID = -493313481197504121L; @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; @@ -50,4 +52,12 @@ public class MesWorkCell extends BaseBean { @Column(name = "SEQ") @ApiParam("序号") private Integer seq; + + @Column(name = "WORK_CELL_IP") + @ApiParam("工作单元IP") + private String workCellIp; + + @Column(name = "WORK_CELL_PORT") + @ApiParam("工作单元端口") + private String workCellPort; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java index 811c01c..8047c46 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -9,10 +9,8 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -28,8 +26,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("工位监控异常信息") -public class MesWorkCellMonitorLog extends BaseBean { +public class MesWorkCellMonitorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -5634446206963213556L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -58,6 +57,7 @@ public class MesWorkCellMonitorLog extends BaseBean { @ApiParam("流程") private String routeCOde; + @Lob @Column(name = "MESSAGE") @ApiParam("异常信息") private String message; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java index 97f8525..87a0f2e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工作单元参数 @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") -public class MesWorkCellParam extends BaseBean { +public class MesWorkCellParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -3659425774085368499L; @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java index 89717dc..c0d5a20 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工作单元参数配置 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_PARAM_CFG") @Api("工作单元参数配置") -public class MesWorkCellParamCfg extends BaseBean { +public class MesWorkCellParamCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 1739991089354361293L; @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java index 5a4c0f1..74c2a09 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 工站队列 @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") -public class MesWorkCellPoint extends BaseBean { +public class MesWorkCellPoint extends BaseBean implements Serializable { + private static final long serialVersionUID = 2881841596678871526L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java index bde424e..4ba402c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工作中心 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CENTER") @Api("工作中心") -public class MesWorkCenter extends BaseBean { +public class MesWorkCenter extends BaseBean implements Serializable { + private static final long serialVersionUID = -1119897685621371682L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 4a52798..956a931 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -23,14 +24,19 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +} +) @Api("生产工单") -public class MesWorkOrder extends BaseBean { - @Column(name = "ORDER_NO") +public class MesWorkOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 8065877030194822855L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; @@ -146,6 +152,11 @@ public class MesWorkOrder extends BaseBean { @ApiParam("首检生成数量") private Double fiGenerateQty; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java index acaf12d..e06560c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,8 @@ import javax.persistence.*; @Index(columnList = "CREATE_DATE_TIME") }) @Api("生产工单日志") -public class MesWorkOrderLog extends BaseBean { +public class MesWorkOrderLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -7018645997937147427L; @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java new file mode 100644 index 0000000..f70aaaa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/10 0010 - 15:28 + */ +@Data +@Api("数据采集Model") +public class DataAcquisitionModel { + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +// +// @ApiParam("组号") +// private String groupNo; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java new file mode 100644 index 0000000..ed2bc6c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/2/21 17:20 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工位监控观察者对象") +public class PcsObserverStatusModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("运行状况") + private Boolean runningStatus; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java new file mode 100644 index 0000000..727e482 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProductDataModel { + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java new file mode 100644 index 0000000..f2ec4a3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2020\1\13 17:23 + * @Modify: + **/ +@Data +public class QcCheckStandardModel { + + private Long id; + + @ApiParam("列头") + private String title; + + private List resultList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java index 7a32f8b..bdb5567 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -42,24 +42,37 @@ public class QueueJisModel implements Serializable { @ApiParam("产品条码") private String serialNumber; + @ApiParam("明细整体状态") + private Integer finalStatus; + @ApiParam("状态名称") private String statusName; @ApiParam("明细状态名称") private String detailStatusName; + @ApiParam("明细整体状态名称") + private String finalStatusName; + + @ApiParam("颜色") + private String color; + public String getStatusName() { - return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status); + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); } public String getDetailStatusName() { - return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus); + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); + } + + public String getFinalStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); } public QueueJisModel() { } - public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) { + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { this.jisNo = jisNo; this.vinCode = vinCode; this.carNo = carNo; @@ -71,6 +84,7 @@ public class QueueJisModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.detailStatus = detailStatus; this.serialNumber = serialNumber; + this.finalStatus = finalStatus; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java index e86fd56..978fd4b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -49,4 +49,7 @@ public class StationResultBean implements Serializable { @ApiParam("图片路径") private String imageUrl; + + @ApiParam("多个数据集") + private List> stationResultBeans; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java new file mode 100644 index 0000000..ab30bd7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Collection; + +@Data +@Api("工步返回信息") +public class StepResult { + + private boolean isCompleted; + + private T data; + + private Collection dataCollection; + + private String msg; + + public static StepResult getSuccessComplete() { + return new StepResult(true,""); + } + + public static StepResult getNonComplete() { + return new StepResult(false,""); + } + + public static StepResult getSuccessComplete(String msg) { + return new StepResult(true, msg); + } + + public static StepResult getNonComplete(String msg) { + return new StepResult(false, msg); + } + + public static StepResult getSuccessData(T data, String msg) { + return new StepResult<>(true, data, msg); + } + + public static StepResult getSuccessData(Collection data, String msg) { + return new StepResult(true, data, msg); + } + + private StepResult() { + } + + private StepResult(boolean isCompleted) { + this.isCompleted = isCompleted; + } + + private StepResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public StepResult(boolean isCompleted, T data, String msg) { + this.isCompleted = isCompleted; + this.data = data; + this.msg = msg; + } + + public StepResult(boolean isCompleted, Collection dataCollection, String msg) { + this.isCompleted = isCompleted; + this.dataCollection = dataCollection; + this.msg = msg; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java new file mode 100644 index 0000000..46e8f5d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java @@ -0,0 +1,15 @@ +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.MesMonitorTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:42 + */ +@Repository +public interface MesMonitorTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java new file mode 100644 index 0000000..f87ff43 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java @@ -0,0 +1,15 @@ +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.MesMonitorTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:43 + */ +@Repository +public interface MesMonitorTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java new file mode 100644 index 0000000..6489cec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java @@ -0,0 +1,10 @@ +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.MesTime; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesTimeRepository 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 6eea3a5..8d48efd 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 @@ -173,8 +173,6 @@ public class MesHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - DdlPreparedPack.getOrderDefault(mesWorkOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; } @@ -205,9 +203,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); } - - DdlPreparedPack.getOrderDefault(mesPart); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); return packBean; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index e84cc53..98d4fc0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; import java.math.BigDecimal; /** @@ -27,8 +28,9 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_DISMENTLE_RECORD") @Api("物料拆解表") -public class IfDismantleRecord extends BaseBean { +public class IfDismantleRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -4111096221719995107L; @Column(name = "DISMANTLE_ID") @ApiParam("拆解编号") private String dismantleId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 8e4e221..d08568e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PACKAGE_DETAIL") @Api("包装明细表") -public class IfPackageDetail extends BaseBean { +public class IfPackageDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412635747424111476L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 686f3de..5d8e27c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") @Api("生产报工表") -public class IfProductOffLine extends BaseBean { +public class IfProductOffLine extends BaseBean implements Serializable { + private static final long serialVersionUID = -4960147948435537306L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java index f66ba69..df240bc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_WMS_PPM") @Api("WMS PPM 接口表") -public class IfWmsPpm extends BaseBean { +public class IfWmsPpm extends BaseBean implements Serializable { + private static final long serialVersionUID = -4767432446545933514L; @Column(name = "YEAR") @ApiParam("年") private String year; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java index 184d48e..d58ab5f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION") @Api("mes系统业务动作") -public class MesAction extends BaseBean { +public class MesAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182851667690154L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java index bbd7782..7f2a912 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION_IF") @Api("动作接口配置") -public class MesActionIf extends BaseBean { +public class MesActionIf extends BaseBean implements Serializable { + private static final long serialVersionUID = -8087788887938933153L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java index 0a7ad5a..68d952f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作方法 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION_METHOD") @Api("系统业务动作方法") -public class MesActionMethod extends BaseBean { +public class MesActionMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -6918114443014306607L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java index b8cc379..856d009 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,7 +32,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_AREA") @Api("生产区域") -public class MesArea extends BaseBean { +public class MesArea extends BaseBean implements Serializable { + private static final long serialVersionUID = 4320604250440221043L; @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 4b20366..f2bf9b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :BOM清单 @@ -29,7 +30,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BOM") @Api("BOM清单") -public class MesBom extends BaseBean { +public class MesBom extends BaseBean implements Serializable { + private static final long serialVersionUID = 6781011059554785782L; @Column(name = "PART_NO") @ApiParam("父零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 1b7c85c..62e0e18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes按钮状态配置表 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BUTTON_STATUS") @Api("按钮状态配置表") -public class MesButtonStatus extends BaseBean { +public class MesButtonStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 1076891253916045865L; @Column(name = "BUTTON_CODE") @ApiParam("按钮代码") private String buttonCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index 5505b11..a775b40 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工位投料信息 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CELL_FEED") @Api("工位投料信息") -public class MesCellFeed extends BaseBean { +public class MesCellFeed extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369479107782L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java index 3e61c2a..d385b72 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :配置表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONFIG") @Api("mes配置表") -public class MesConfig extends BaseBean { +public class MesConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = 2462824203686013806L; @Column(name = "CFG_CODE") @ApiParam("配置代码") private String cfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 7483771..8382b3e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -22,11 +23,15 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +}) @Api("客户信息") -public class MesCustOrder extends BaseBean { +public class MesCustOrder extends BaseBean implements Serializable { - @Column(name = "ORDER_NO") + private static final long serialVersionUID = 4990079075654538033L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("订单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index 0c0caea..c8da995 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUST_PROD_LINE") @Api("客户产线代码") -public class MesCustProdLine extends BaseBean { +public class MesCustProdLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 7865628597341120516L; @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index 8be5b29..cbd6a59 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes客户表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER") @Api("客户产线代码") -public class MesCustomer extends BaseBean { +public class MesCustomer extends BaseBean implements Serializable { + private static final long serialVersionUID = 6049359006918853570L; @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index b66a21c..a943c4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes客户表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER_PART") @Api("客户零件关系") -public class MesCustomerPart extends BaseBean { +public class MesCustomerPart extends BaseBean implements Serializable { + private static final long serialVersionUID = 2600442373171403668L; @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index 6670060..7e0b93f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DATA_OBJECT") @Api("数据对象") -public class MesDataObject extends BaseBean { +public class MesDataObject extends BaseBean implements Serializable { + private static final long serialVersionUID = -6422621561140177350L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index ebe9d58..cfea1ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DATASOURCE") @Api("地址清单") -public class MesDatasource extends BaseBean { +public class MesDatasource extends BaseBean implements Serializable { + private static final long serialVersionUID = 4318109359733890067L; @Column(name = "DS_CODE") @ApiParam("数据源代码") private String dsCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index 58110f3..9157fa8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DEFECT") @Api("缺陷表") -public class MesDefect extends BaseBean { +public class MesDefect extends BaseBean implements Serializable { + private static final long serialVersionUID = -317846359848236696L; @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java index b98052e..fb28c44 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DEFECT_CAUSE") @Api("缺陷原因表") -public class MesDefectCause extends BaseBean { +public class MesDefectCause extends BaseBean implements Serializable { + private static final long serialVersionUID = -4078847071878784152L; @Column(name = "DC_CODE") @ApiParam("缺陷原因代码") private String dcCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 270686e..d034489 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; import java.util.Date; /** @@ -31,7 +32,8 @@ import java.util.Date; @Index(columnList = "CREATE_DATE_TIME") }) @Api("不良信息记录表") -public class MesDefectRecord extends BaseBean { +public class MesDefectRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -6672562641463628050L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index d75e2d4..6fff826 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -30,8 +31,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("物料拆解记录表") -public class MesDismantleRecord extends BaseBean { +public class MesDismantleRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -7921777462483107776L; @Column(name = "DISMANTLE_ID") @ApiParam("拆解编号") private String dismantleId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index 713dc90..2bcd8d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :设备通知对象配置 @@ -25,7 +26,8 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name="MES_EQU_NOTIFY_OBJECT_CFG") @Api("设备通知对象配置") -public class MesEquNotifyObjectCfg extends BaseBean { +public class MesEquNotifyObjectCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 952143489409789623L; @Column(name="NOTIFY_OBJECT_CODE") @ApiParam("对象代码") private String notifyObjectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 6b6fbc2..8c1b09f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -26,11 +27,14 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK", indexes = { @Index(columnList = "TASK_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO"}) }) @Api("设备作业任务") -public class MesEquTask extends BaseBean { +public class MesEquTask extends BaseBean implements Serializable { - @Column(name = "TASK_NO") + private static final long serialVersionUID = -3351277499164455197L; + @Column(name = "TASK_NO", nullable = false) @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index 8f3b70f..e164c36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -26,15 +27,18 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK_DETAIL", indexes = { @Index(columnList = "EQUIPMENT_CODE") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO", "EQUIPMENT_CODE"}) }) @Api("设备作业任务明细") -public class MesEquTaskDetail extends BaseBean { +public class MesEquTaskDetail extends BaseBean implements Serializable { - @Column(name = "TASK_NO") + private static final long serialVersionUID = 3317290109159353376L; + @Column(name = "TASK_NO", nullable = false) @ApiParam("作业任务编号") private String taskNo; - @Column(name = "EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE", nullable = false) @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java index 4d4d1b6..53438d6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :设备作业通知配置 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="MES_EQU_TASK_NOTIFY_CFG") @Api("设备作业通知配置") -public class MesEquTaskNotifyCfg extends BaseBean { +public class MesEquTaskNotifyCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5074890809083209298L; @Column(name="TASK_TYPE") @ApiParam("作业类型") private Integer taskType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 89d70d6..7e86112 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :设备周期作业计划 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK_PLAN") @Api("设备周期作业计划") -public class MesEquTaskPlan extends BaseBean { +public class MesEquTaskPlan extends BaseBean implements Serializable { + private static final long serialVersionUID = 6583606304459518148L; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java index 2ecea3c..8d4a7b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :设备维修作业记录 @@ -27,8 +28,9 @@ import javax.persistence.*; @Index(columnList = "EQUIPMENT_CODE") }) @Api("设备维修作业记录") -public class MesEquTaskRepairRecord extends BaseBean { +public class MesEquTaskRepairRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 5431970816367411649L; @Column(name = "TASK_NO") @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java index 038ee6e..7e79763 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :设备作业要求 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK_STANDARD") @Api("设备作业要求") -public class MesEquTaskStandard extends BaseBean { +public class MesEquTaskStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8619366076594894497L; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index b3c3b6e..e506922 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :设备点检保养作业记录 @@ -27,8 +28,9 @@ import javax.persistence.*; @Index(columnList = "EQUIPMENT_CODE") }) @Api("设备点检保养作业记录") -public class MesEquTaskStandardRecord extends BaseBean { +public class MesEquTaskStandardRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -4122427049015017390L; @Column(name = "TASK_NO") @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index 1fa153b..15f8628 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :生产设备 @@ -30,7 +31,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQUIPMENT") @Api("生产设备") -public class MesEquipment extends BaseBean { +public class MesEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 5167143191710128193L; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; 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 index b7aa754..723251f 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 @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") -public class MesEsop extends BaseBean { +public class MesEsop extends BaseBean implements Serializable { + private static final long serialVersionUID = -2025246159538929513L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java index 9716989..c8905c5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务事件 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EVENT") @Api("系统业务事件") -public class MesEvent extends BaseBean { +public class MesEvent extends BaseBean implements Serializable { + private static final long serialVersionUID = -2941486161983912085L; @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java index 0f90cc4..51b0507 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务事件动作 @@ -31,7 +32,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EVENT_ACTION") @Api("系统业务事件动作") -public class MesEventAction extends BaseBean { +public class MesEventAction extends BaseBean implements Serializable { + private static final long serialVersionUID = 1188871471049646861L; @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java index 888bb7a..213bebc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_CAUSE") @Api("mes设备故障原因表") -public class MesFaultCause extends BaseBean { +public class MesFaultCause extends BaseBean implements Serializable { + private static final long serialVersionUID = 1229825197241375978L; @Column(name = "FC_CODE") @ApiParam("故障原因代码") private String fcCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java index 06d07d8..7cdfd96 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_METHOD") @Api("mes设备故障方法表") -public class MesFaultMethod extends BaseBean { +public class MesFaultMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -1366849757709967125L; @Column(name = "FM_CODE") @ApiParam("故障方法代码") private String fmCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index b3ec52c..f9c2852 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_PHENOMENON") @Api("mes设备故障现象表") -public class MesFaultPhenomenon extends BaseBean { +public class MesFaultPhenomenon extends BaseBean implements Serializable { + private static final long serialVersionUID = 4373435095236791300L; @Column(name = "FP_CODE") @ApiParam("故障现象代码") private String fpCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index 0ee50ab..24228ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FI_CFG") @Api("首检件配置") -public class MesFiCfg extends BaseBean { +public class MesFiCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 6919161447256638470L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; 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 index c1d30dd2..9df7aa3 100644 --- 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FILE") @Api("文件表") -public class MesFile extends BaseBean { +public class MesFile extends BaseBean implements Serializable { + private static final long serialVersionUID = 5057339077996828057L; @Column(name = "FILE_NAME") @ApiParam("文件名称") private String fileName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java index 1845202..7ef9e84 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_IF") @Api("接口清单") -public class MesIf extends BaseBean { +public class MesIf extends BaseBean implements Serializable { + private static final long serialVersionUID = 7711015387041039390L; @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java index d140412..e036e8a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KEY_ACTION") @Api("关键动作") -public class MesKeyAction extends BaseBean { +public class MesKeyAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -7873249749411068317L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index 1812e98..b17f81d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KEY_DATA") @Api("设备关键数据") -public class MesKeyData extends BaseBean { +public class MesKeyData extends BaseBean implements Serializable { + private static final long serialVersionUID = 3843016083013276333L; @Column(name = "KEY_DATA_CODE") @ApiParam("关键数据代码") private String keyDataCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index 155c5c2..f3bd22c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KP_DATA") @Api("物料关键数据关系") -public class MesKpData extends BaseBean { +public class MesKpData extends BaseBean implements Serializable { + private static final long serialVersionUID = 8243089140216459544L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java index 25545e4..e0c9fca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KPSN_RULE") @Api("关键件条码校验规则") -public class MesKpsnRule extends BaseBean { +public class MesKpsnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = 2592621267902381297L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 6ee033d..ffac585 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -25,7 +26,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") -public class MesLabelTemplate extends BaseBean { +public class MesLabelTemplate extends BaseBean implements Serializable { private static final long serialVersionUID = 5371856566557305323L; @Column(name = "TEMPLATE_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java index f64074e..c106bb2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 打印模板参数 @@ -26,7 +27,7 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") -public class MesLabelTemplateParam extends BaseBean { +public class MesLabelTemplateParam extends BaseBean implements Serializable { private static final long serialVersionUID = 6476163540527157643L; @Column(name = "TEMPLATE_ID") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index 9cb2acc..604d661 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务方法 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_METHOD") @Api("系统业务方法") -public class MesMethod extends BaseBean { +public class MesMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -3254086662292709833L; @Column(name = "METHOD_CODE") @ApiParam("方法代码") private String methodCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java new file mode 100644 index 0000000..3025972 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -0,0 +1,52 @@ +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; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:11 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK") +@Api("监听任务") +public class MesMonitorTask extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4606062283853607814L; + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_OBJECT_TYPE") + @ApiParam("任务对象类型") + private Integer taskObjectType; + + @Column(name = "TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + + @Column(name = "TASK_EXCEPTION_DESC") + @ApiParam("异常描述") + private String taskExceptionDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java new file mode 100644 index 0000000..c2ef72e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -0,0 +1,53 @@ +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; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:19 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK_DETAIL") +@Api("监听任务明细") +public class MesMonitorTaskDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8703163858851139587L; + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "DATA_OBJECT_NO") + @ApiParam("数据对象编号") + private String dataObjectNo; + +// @Column(name = "STORE_OBJECT_CODE") +// @ApiParam("存储对象代码") +// private String storeObjectCode; +// +// @Column(name = "STORE_FIELD_CODE") +// @ApiParam("存储字段代码") +// private String storeFieldCode; + + @Transient + @ApiParam("任务名称") + private String taskName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index edbbdeb..cac557d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_NUMBER_RULE") @Api("条码生成规则") -public class MesNumberRule extends BaseBean { +public class MesNumberRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -7547623897602721464L; @Column(name = "RULE_CODE") @ApiParam("规则代码") private String ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java index 1c68f28..d4551a2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_NUMBER_SERIALNO") @Api("编码序号") -public class MesNumberSerialno extends BaseBean { +public class MesNumberSerialno extends BaseBean implements Serializable { + private static final long serialVersionUID = -6004402998083665263L; @Column(name = "CURRENT_NUMBER_PREFIX") @ApiParam("当前编号前缀") private String currentNumberPrefix; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index d9ead26..dfe9551 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_OBJECT_CFG") @Api("对象结构") -public class MesObjectCfg extends BaseBean { +public class MesObjectCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 55753384888695913L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java index 87f07f9..10e85f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :MES_对象与dao对应关系 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_OBJECT_DAO") @Api("MES_对象与dao对应关系") -public class MesObjectDao extends BaseBean { +public class MesObjectDao extends BaseBean implements Serializable { + private static final long serialVersionUID = 2286752362359060L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java index be9933d..f54e7b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :PLC设备信息配置表 @@ -28,7 +29,8 @@ import javax.persistence.Table; @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") @Deprecated -public class MesPLCConfigure extends BaseBean { +public class MesPLCConfigure extends BaseBean implements Serializable { + private static final long serialVersionUID = 2609782937477343108L; @Column(name = "IP") @ApiParam("设备ip") private String ipAddress; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index 6db75b4..1880189 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :包装规格 @@ -29,7 +30,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACK_SPEC") @Api("包装规格") -public class MesPackSpec extends BaseBean { +public class MesPackSpec extends BaseBean implements Serializable { + private static final long serialVersionUID = -5750996334546906547L; @Column(name = "SPEC_CODE") @ApiParam("包装规格代码") private String specCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index ec8810e..79fe8cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -21,10 +22,14 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) +}) @Api("包装规格") -public class MesPackage extends BaseBean { - @Column(name = "PACKAGE_NO") +public class MesPackage extends BaseBean implements Serializable { + private static final long serialVersionUID = 5275923991324889995L; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index e358ca6..5c44dcd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -9,10 +9,8 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -24,15 +22,19 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) +}) @Api("包装规格明细") -public class MesPackageDetail extends BaseBean { +public class MesPackageDetail extends BaseBean implements Serializable { - @Column(name = "PACKAGE_NO") + private static final long serialVersionUID = 6980459490465566975L; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 589f3f6..19434f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") -public class MesPackageTravel extends BaseBean { +public class MesPackageTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -6425620221708201986L; @Column(name = "PACKAGE_NO") @ApiParam("包装编码") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 65ba2cc..3b117e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :物料信息 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART") @Api("物料信息") -public class MesPart extends BaseBean { +public class MesPart extends BaseBean implements Serializable { + private static final long serialVersionUID = -7731182105899332283L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java index c54eb24..f356754 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :零件种类 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_CATEGORY") @Api("零件种类") -public class MesPartCategory extends BaseBean { +public class MesPartCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = 106841156414035968L; @Column(name = "CATEGORY_CODE") @ApiParam("分类代码") private String categoryCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index 0bac54e..a399ef3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_OBJECT") @Api("物料对象配置表") -public class MesPartObject extends BaseBean { +public class MesPartObject extends BaseBean implements Serializable { + private static final long serialVersionUID = 5548158596994937446L; @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index 2512950..ac42795 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_SCHEDULE_BOM") @Api("生产排程清单") -public class MesPartScheduleBom extends BaseBean { +public class MesPartScheduleBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -1189509386674221628L; @Column(name = "PART_NO") @ApiParam("排程物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index b7a7b64..62553f7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运模式 @@ -28,8 +29,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesPatternJis extends BaseBean { +public class MesPatternJis extends BaseBean implements Serializable { + private static final long serialVersionUID = 216398440591829755L; @Column(name = "PATTERN_NO") @ApiParam("模式编号") private String patternNo; @@ -38,29 +40,29 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理队列数") + private Integer handleNo; @Column(name = "PATTERN_DESC") @ApiParam("描述") private String patternDesc; - @Column(name = "TOP_NO") - @ApiParam("一次显示TOP数") - private Integer topNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; @Column(name = "PATTERN_TYPE") @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_TYPE") - @ApiParam("是否按主队列顺序扫描") - private Integer scanType; + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index 9dac636..bc3f570 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN") @Api("PCN节点") -public class MesPcn extends BaseBean { +public class MesPcn extends BaseBean implements Serializable { + private static final long serialVersionUID = -9150091413555406397L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java index b33cb55..7e00e8e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") -public class MesPcnConnectLog extends BaseBean { +public class MesPcnConnectLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 2756240593256441951L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 2cf0ddf..2f33165 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -28,7 +29,7 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") -public class MesPcnSyncCfg extends BaseBean { +public class MesPcnSyncCfg extends BaseBean implements Serializable { private static final long serialVersionUID = 7270930330576127126L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java index 0c83b33..01015d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYNC_ERRORLOG") @Api("MES_PCN同步异常日志") -public class MesPcnSyncErrorLog extends BaseBean { +public class MesPcnSyncErrorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -6031591772505958774L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 80deb8f..6217557 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes-pcn定时任务工作清单 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") -public class MesPcnTask extends BaseBean { +public class MesPcnTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 4129717677965409395L; @Column(name = "TASK_CODE") @ApiParam("任务代码") private String taskCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 08c7787..01be425 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -23,10 +24,14 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +}) @Api("生产主计划") -public class MesPlanOrder extends BaseBean { - @Column(name = "ORDER_NO") +public class MesPlanOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 6773005820598583458L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 5623665..7d9c0b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -28,8 +29,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC") @Api("PLC配置表") -public class MesPlc extends BaseBean { +public class MesPlc extends BaseBean implements Serializable { + private static final long serialVersionUID = -7172265186837551268L; @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; @@ -98,6 +100,10 @@ public class MesPlc extends BaseBean { @ApiParam("反馈值") private String feedValue; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java index b2df5e6..a60fa3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工序 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROCESS") @Api("工序") -public class MesProcess extends BaseBean { +public class MesProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = -615476712907856558L; @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 32ad09c..9f84b79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -10,10 +10,8 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; +import java.io.Serializable; /** * @Description :产品绑定记录表 @@ -29,11 +27,17 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_BIND_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "KP_SN") + @Index(columnList = "KP_SN"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "ITEM_PART_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "KP_SN"}) }) @Api("产品绑定记录表") -public class MesProdBindRecord extends BaseBean { - @Column(name = "SERIAL_NUMBER") +public class MesProdBindRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -6984193022328810942L; + // 联合唯一索引必须加:, nullable = false + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam(value = "产品条码") private String serialNumber; @@ -61,7 +65,7 @@ public class MesProdBindRecord extends BaseBean { @ApiParam("原材料零件号") private String itemPartNo; - @Column(name = "KP_SN") + @Column(name = "KP_SN", nullable = false) @ApiParam("原材料条码") private String kpSn; @@ -98,6 +102,19 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "动作类型") private String actionType; + @ApiParam(value = "是否绑定关键件名称") + private String isBindKeyName; + + @ApiParam(value = "动作类型名称") + private String actionTypeName; + + @ApiParam("产品条码零件名称") + private String partName; + + @ApiParam("原材料零件名称") + private String itemPartName; + + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index 0bf480c..f77984a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品配置 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG") @Api("产品配置") -public class MesProdCfg extends BaseBean { +public class MesProdCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -1301835558902463754L; @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index 3a83eaf..151a929 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :产品配置明细 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG_DETAIL") @Api("产品配置明细") -public class MesProdCfgDetail extends BaseBean { +public class MesProdCfgDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -5678006170645940563L; @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java index c7b115c..42b3801 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品配置类型 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG_TYPE") @Api("产品配置类型") -public class MesProdCfgType extends BaseBean { +public class MesProdCfgType extends BaseBean implements Serializable { + private static final long serialVersionUID = -1726288926948811617L; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("产品配置类型代码") private String prodCfgTypeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index f8808b2..f5438ae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_PACK") @Api("产品包装关系") -public class MesProdPack extends BaseBean { +public class MesProdPack extends BaseBean implements Serializable { + private static final long serialVersionUID = -5748484568201154400L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index 8ef8f1e..d33cc8e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品类流程配置表 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_ROUTE_CFG") @Api("产品类流程配置表") -public class MesProdRouteCfg extends BaseBean { +public class MesProdRouteCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -3903152693262813917L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 313d7e7..074dea2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :产品流程配置操作参数表 @@ -27,7 +28,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_ROUTE_OPT_PARAM") @Api("产品流程配置操作参数表") -public class MesProdRouteOptParam extends BaseBean { +public class MesProdRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -5043197912658757665L; @Column(name = "PROD_ROUTE_CFG_ID") @ApiParam("产品流程ID") private Long prodRouteCfgId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java index a648835..622dc1f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CATEGORY") @Api("系统业务动作") -public class MesProduceCategory extends BaseBean { +public class MesProduceCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = -992595557921651448L; @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCategoryCode; 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 bd45841..4a8a103 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 @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CTGY_PICTURE") @Api("产品类型图片表") -public class MesProduceCtgyPicture extends BaseBean { +public class MesProduceCtgyPicture extends BaseBean implements Serializable { + private static final long serialVersionUID = 4199856772441042802L; @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCtgyCode; 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 a1585c7..2f6fe5e 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 @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.math.BigDecimal; /** @@ -24,14 +25,17 @@ import java.math.BigDecimal; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "PART_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) }) @Api("产品条码表") -public class MesProduceSn extends BaseBean { +public class MesProduceSn extends BaseBean implements Serializable { - @Column(name = "SERIAL_NUMBER") + private static final long serialVersionUID = -1630924042562178494L; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; @@ -127,6 +131,11 @@ public class MesProduceSn extends BaseBean { @ApiParam("操作类型") private Integer operateType; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public transient Integer lockVersion; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index ab88546..ef63c50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 产品条码履历实体类 @@ -26,10 +27,12 @@ import javax.persistence.*; @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "PART_NO"), @Index(columnList = "MODIFY_DATE_TIME") }) @Api("产品条码履历表") -public class MesProduceSnTravel extends BaseBean { +public class MesProduceSnTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -1807953720033107108L; @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index fc86e50..cd951ae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :生产数据 @@ -33,7 +34,8 @@ import javax.persistence.*; }) @ElasticSearch @Api("生产数据") -public class MesProductData extends BaseBean { +public class MesProductData extends BaseBean implements Serializable { + private static final long serialVersionUID = 4514407617515827040L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -107,9 +109,10 @@ public class MesProductData extends BaseBean { private String groupNo; @Json4Es - @Column(name = "TEST_DATA") - @ApiParam("测试json数据") - private String testData; + @Lob + @Column(name = "LINE_DATA") + @ApiParam("生产数据") + private String lineData; @Lob @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java index f3a2b64..83bd787 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCT_ENCODE_CFG") @Api("产品编码配置") -public class MesProductEncodeCfg extends BaseBean { +public class MesProductEncodeCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 5608141802461306170L; @Column(name = "CODE_TYPE") @ApiParam("编码类型") private Integer codeType; 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 1daf186..743751a 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 @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -25,11 +26,13 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_CHECK_DATA", indexes = { @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "SN") + @Index(columnList = "SN"), + @Index(columnList = "PART_NO") }) @Api("质量过程检测数据") -public class MesQcCheckData extends BaseBean { +public class MesQcCheckData extends BaseBean implements Serializable { + private static final long serialVersionUID = -8044433561607606170L; @Column(name = "CHECK_ID") @ApiParam("检测id") private String checkId; @@ -93,4 +96,24 @@ public class MesQcCheckData extends BaseBean { @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; + + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("班次") + private String shiftCode; + + @Transient + @ApiParam("班组") + private String shiftGroupName; + + @Transient + @ApiParam("班长") + private String squadLeader; + + @Transient + @ApiParam("工作单元名称") + private String workCellName; } 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 338075d..b4f6388 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 @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") -public class MesQcCheckStandard extends BaseBean { +public class MesQcCheckStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 3977375527789854590L; @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java index 0180221..1ad2431 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,8 +32,9 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUALITY_STANDARD_CFG") @Api("质量标准配置") -public class MesQualityStandardCfg extends BaseBean { +public class MesQualityStandardCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -4529686898125790351L; @Column(name = "STANDARD_TYPE") @ApiParam("标准类型") private Integer standardType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 87f6946..a2d6034 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运队列 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_JIS") @Api("JIS发运队列") -public class MesQueueJis extends BaseBean { +public class MesQueueJis extends BaseBean implements Serializable { + private static final long serialVersionUID = -2712958514118946868L; @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index db45636..f3defbd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运队列明细 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_JIS_DETAIL") @Api("JIS发运队列明细") -public class MesQueueJisDetail extends BaseBean { +public class MesQueueJisDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -3242843412307565585L; @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; @@ -49,6 +51,10 @@ public class MesQueueJisDetail extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "FINAL_STATUS") + @ApiParam("发运整体状态") + private Integer finalStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index d98293c..8b8a70c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -28,10 +29,13 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER", indexes = { @Index(columnList = "CUST_FLAG_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) }) @Api("生产队列主表") -public class MesQueueOrder extends BaseBean { - @Column(name = "ORDER_NO") +public class MesQueueOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = -7459452106180601417L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index c57ba78..589f92e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -24,14 +25,17 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) }) @Api("生产队列明细") -public class MesQueueOrderDetail extends BaseBean { - @Column(name = "ORDER_NO") +public class MesQueueOrderDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 7840873844253353896L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index 57862f5..cf7ee95 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -28,7 +29,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") -public class MesRawPartSn extends BaseBean { +public class MesRawPartSn extends BaseBean implements Serializable { + private static final long serialVersionUID = 1590983555938105569L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java index 08f1544..d2514e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :维修 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_REPAIR") @Api("维修") -public class MesRepair extends BaseBean { +public class MesRepair extends BaseBean implements Serializable { + private static final long serialVersionUID = 5304257976947321917L; @Column(name = "REPAIR_CODE") @ApiParam("维修代码") private String repairCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index 6d526a0..0026eeb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -27,11 +28,13 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_REPAIR_RECORD", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "PART_NO") }) @Api("维修信息记录表") -public class MesRepairRecord extends BaseBean { +public class MesRepairRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -1758374702271940323L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index 5c55d35..ca98cbe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :流程表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE") @Api("流程表") -public class MesRoute extends BaseBean { +public class MesRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = -3616935751787295145L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index 2f84f21..d24696d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :流程工序关系 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS") @Api("流程工序关系") -public class MesRouteProcess extends BaseBean { +public class MesRouteProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = -1248219638779313299L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index ce83ab3..0e3e719 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :工序工作单元 @@ -27,7 +28,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS_CELL") @Api("工序工作单元对照") -public class MesRouteProcessCell extends BaseBean { +public class MesRouteProcessCell extends BaseBean implements Serializable { + private static final long serialVersionUID = 4823057491756814599L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java index 0c745c8..7eab5e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :流程工序工步关系 @@ -27,7 +28,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS_STEP") @Api("流程工序工步关系") -public class MesRouteProcessStep extends BaseBean { +public class MesRouteProcessStep extends BaseBean implements Serializable { + private static final long serialVersionUID = 6325935706401770213L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java index a9fb72c..81a7105 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :报废原因 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SCRAP") @Api("报废原因") -public class MesScrap extends BaseBean { +public class MesScrap extends BaseBean implements Serializable { + private static final long serialVersionUID = 2850681183524213132L; @Column(name = "SCRAP_CODE") @ApiParam("报废代码") private String scrapCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 8138447..6129a7b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -29,8 +30,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("报废信息记录表") -public class MesScrapRecord extends BaseBean { +public class MesScrapRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -5451178133547076360L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 2a285ea..34f25ed 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT") @Api("班次信息") -public class MesShift extends BaseBean { +public class MesShift extends BaseBean implements Serializable { + private static final long serialVersionUID = 4001070186534674096L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 9ef9467..1d7c663 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT_GROUP") @Api("班组") -public class MesShiftGroup extends BaseBean { +public class MesShiftGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 3409573116624543569L; @Column(name = "GROUP_CODE") @ApiParam("班组代码") private String groupCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index 6d82d9e..c7e212a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT_REST") @Api("班次休息信息") -public class MesShiftRest extends BaseBean { +public class MesShiftRest extends BaseBean implements Serializable { + private static final long serialVersionUID = 5486276486536860088L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 89abdff..0ad8795 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :工位物料清单 @@ -29,7 +30,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STATION_BOM") @Api("工位物料清单") -public class MesStationBom extends BaseBean { +public class MesStationBom extends BaseBean implements Serializable { + private static final long serialVersionUID = 1817387724628691734L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index 7d08328..32fa323 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工步 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STEP") @Api("工步") -public class MesStep extends BaseBean { +public class MesStep extends BaseBean implements Serializable { + private static final long serialVersionUID = -1106608189453496947L; @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index fbda6ca..b2ca5cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工步参数 @@ -26,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STEP_PARAM") @Api("工步参数") -public class MesStepParam extends BaseBean { +public class MesStepParam extends BaseBean implements Serializable { + private static final long serialVersionUID = 6709455994477993263L; @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java new file mode 100644 index 0000000..3692f51 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2020/02/15 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SYNC_DEAD_LETTER", indexes = { + @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"), + @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE") +}) +@Api("数据同步死信") +public class MesSyncDeadLetter extends BaseBean implements Serializable { + private static final long serialVersionUID = 1151025992437433734L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型") + private Integer syncType; + + @Column(name = "PCN_CODE") + @ApiParam("pcn代码") + private String pcnCode; + + @Lob + @Column(name = "EX_MSG") + @ApiParam("同步数据") + private String exMsg; + + @Lob + @Column(name = "DATA") + @ApiParam("同步数据") + private String data; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index d2a2158..a1a92cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_TYPE_CFG") @Api("类型信息表") -public class MesTypeCfg extends BaseBean { +public class MesTypeCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 7666533200631763797L; @Column(name = "TYPE_CODE") @ApiParam("类型代码") private String typeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java index dc37069..ff626d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WC_CHECK") @Api("开线检查") -public class MesWcCheck extends BaseBean { +public class MesWcCheck extends BaseBean implements Serializable { + private static final long serialVersionUID = 7937744978114334701L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java index 9beab8f..5d7bced 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -28,8 +29,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("开线检查记录") -public class MesWcCheckRecord extends BaseBean { +public class MesWcCheckRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 6919654845394560128L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java index 4cc2a15..cb619b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WC_EQUIPMENT") @Api("工作单元设备关系表") -public class MesWcEquipment extends BaseBean { +public class MesWcEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 188390912605665500L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 7fd8998..2f0533a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -30,7 +31,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL") @Api("工作单元") -public class MesWorkCell extends BaseBean { +public class MesWorkCell extends BaseBean implements Serializable { + private static final long serialVersionUID = 8552890090536989486L; @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; @@ -55,6 +57,14 @@ public class MesWorkCell extends BaseBean { @ApiParam("序号") private Integer seq; + @Column(name = "WORK_CELL_IP") + @ApiParam("工作单元IP") + private String workCellIp; + + @Column(name = "WORK_CELL_PORT") + @ApiParam("工作单元端口") + private String workCellPort; + @Transient @ApiParam(value = "子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index 7806868..06dc991 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -28,8 +29,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("工位监控异常信息") -public class MesWorkCellMonitorLog extends BaseBean { +public class MesWorkCellMonitorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 1432794181428753903L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java index 0baae07..eb03cdc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :工作单元参数 @@ -27,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") -public class MesWorkCellParam extends BaseBean { +public class MesWorkCellParam extends BaseBean implements Serializable { + private static final long serialVersionUID = 1017369816822438021L; @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index 68d7afa..8c33b9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :工作单元参数配置 @@ -27,7 +28,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_PARAM_CFG") @Api("工作单元参数配置") -public class MesWorkCellParamCfg extends BaseBean { +public class MesWorkCellParamCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -8507576103087989740L; @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 0abb9dd..ed04956 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -30,8 +31,9 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") -public class MesWorkCellPoint extends BaseBean { +public class MesWorkCellPoint extends BaseBean implements Serializable { + private static final long serialVersionUID = -6817903235638554748L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 4caea9d..f57305a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -30,7 +31,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CENTER") @Api("工作中心") -public class MesWorkCenter extends BaseBean { +public class MesWorkCenter extends BaseBean implements Serializable { + private static final long serialVersionUID = 5583253625290231595L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 557402d..7633f77 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -23,14 +24,19 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_WORK_ORDER", indexes = { + @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +}) @Api("生产工单") -public class MesWorkOrder extends BaseBean { - @Column(name = "ORDER_NO") +public class MesWorkOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = -3566003375267865064L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; @@ -146,6 +152,11 @@ public class MesWorkOrder extends BaseBean { @ApiParam("首检生成数量") private Double fiGenerateQty; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index c9d175e..1f91275 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,8 @@ import javax.persistence.*; @Index(columnList = "CREATE_DATE_TIME") }) @Api("生产工单日志") -public class MesWorkOrderLog extends BaseBean { +public class MesWorkOrderLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -5859382100462830988L; @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java index 944b7fd..3c022ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java @@ -32,4 +32,7 @@ public class ActionRequestBean implements Serializable { @ApiParam("Map请求集") public Map resultMap; + + @ApiParam("module代码") + public Integer moduleCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index b8e6909..e632a49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -58,6 +58,9 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("修改日期") public String modifyDatetime; + @ApiParam("修改日期") + public String modifyDatetimePlan; + @ApiParam("作业类型名称") private String taskTypeName; @@ -69,7 +72,7 @@ public class MesEquTaskPlanModel implements Serializable { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -87,5 +90,6 @@ public class MesEquTaskPlanModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.modifyDatetimePlan = modifyDatetimePlan; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index ca5f0ce..732f977 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -55,6 +55,9 @@ public class MesEquTaskStandardModel implements Serializable { @ApiParam("修改日期") public String modifyDatetime; + @ApiParam("修改日期") + public String modifyDatetimeStandard; + @ApiParam("作业类型") private String taskTypeName; @@ -66,7 +69,10 @@ public class MesEquTaskStandardModel implements Serializable { } - public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, + String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, + String organizeCode, Integer isValid, Integer isDeleted, String createUser, + String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -83,5 +89,6 @@ public class MesEquTaskStandardModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.modifyDatetimeStandard = modifyDatetimeStandard; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index c838c4d..19d1a22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -102,6 +102,7 @@ public class MesEquipmentModel implements Serializable { } + //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) { this.id = id; this.equipmentCode = equipmentCode; @@ -111,6 +112,8 @@ public class MesEquipmentModel implements Serializable { this.equipmentCategory = equipmentCategory; } + //根据生产线，工位获取设备集合 findMesEquipmentList + //获取设备分页数据-组织模型 queryMesEquipmentByPagerOrg public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) { this.wcId = wcId; this.id = id; @@ -122,6 +125,7 @@ public class MesEquipmentModel implements Serializable { this.areaCode = areaCode; } + //根据条件查询设备所有有效数据-组织模型下拉框及联 queryMesEquipmentList public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) { this.id = id; this.equipmentNameAndworkCellName = equipmentNameAndworkCellName; @@ -134,13 +138,13 @@ public class MesEquipmentModel implements Serializable { } - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + //获取设备分页数据 queryMesEquipmentByPager + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.status = status; this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; this.areaCode = areaCode; this.equipmentType = equipmentType; this.equipmentCategory = equipmentCategory; 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 62cb029..1ad0189 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 @@ -89,6 +89,9 @@ public class MesPlcModel implements Serializable { @ApiParam("驱动") private String device; + @ApiParam("对象代码") + private String objectCode; + public MesPlcModel() { } @@ -96,7 +99,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 device) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -122,5 +125,6 @@ public class MesPlcModel implements Serializable { this.analysisRule = analysisRule; this.isAnalysis = isAnalysis; this.device = device; + this.objectCode = objectCode; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java new file mode 100644 index 0000000..ef483a5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/2/21 17:20 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工位监控观察者对象") +public class PcsObserverStatusModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("运行状况") + private Boolean runningStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataModel.java new file mode 100644 index 0000000..6d1ad77 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProductDataModel { + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java new file mode 100644 index 0000000..5bd0ae1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesMonitorTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:42 + */ +@Repository +public interface MesMonitorTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.java new file mode 100644 index 0000000..335ca46 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesMonitorTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:43 + */ +@Repository +public interface MesMonitorTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSyncDeadLetterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSyncDeadLetterRepository.java new file mode 100644 index 0000000..3e07f6b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSyncDeadLetterRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSyncDeadLetter; + +/** + * @author Wynne.Lu + * @date 2020/2/18 09:19 + * @desc + */ +public interface MesSyncDeadLetterRepository 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 93083c2..9a46d75 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 @@ -102,10 +102,6 @@ public class MesHqlPack { mesPlanOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - - // 排序 - DdlPreparedPack.getOrderDefault(mesPlanOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPlanOrder.getOrderByParam()}, packBean); return packBean; } @@ -141,8 +137,6 @@ public class MesHqlPack { } else { DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean); } - DdlPreparedPack.getOrderDefault(mesPart); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); return packBean; } @@ -205,7 +199,6 @@ public class MesHqlPack { "createDatetime", packBean, true); } DdlPreparedPack.getOrderDefault(mesWorkOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; } @@ -243,8 +236,6 @@ public class MesHqlPack { "createDatetime", packBean, true); // DdlPreparedPack.getOrderDefault(mesQueueOrder); - // 按照队列序列号倒序 - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{"seq"}, packBean); return packBean; } @@ -321,7 +312,6 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode); DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean); DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean); - packBean.setOrderByStr(mesRoute.orderBy()); return packBean; } @@ -337,7 +327,6 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); - packBean.setOrderByStr(mesProdRouteCfg.orderBy()); return packBean; } @@ -1163,8 +1152,6 @@ public class MesHqlPack { if (null != numberRule.getIsCycle()) { DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean); } - - packBean.setOrderByStr(numberRule.orderBy()); return packBean; } @@ -1183,7 +1170,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPcnTask.getTaskName())) { DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); } - packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } @@ -1230,7 +1216,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(buttonStatus.getButtonCode())) { DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean); } - packBean.setOrderByStr(buttonStatus.orderBy()); return packBean; } @@ -1837,13 +1822,13 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) { DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); @@ -1864,10 +1849,12 @@ public class MesHqlPack { // mesProduceSn.getOutWorkCenterEndTime(), // "outWorkCenterTime", packBean, true); } - DdlPreparedPack.timeBuilder( - mesProduceSn.getCreateDateTimeStart(), - mesProduceSn.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } @@ -1880,11 +1867,11 @@ public class MesHqlPack { */ public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode); - if (!StringUtils.isEmpty(mesProdBindRecord.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getPartNo(), "partNo", packBean); + if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) { + DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean); } if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean); } if (!StringUtils.isEmpty(mesProdBindRecord.getKpSn())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getKpSn(), "kpSn", packBean); @@ -1907,15 +1894,17 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean); } - DdlPreparedPack.timeBuilder( - mesProdBindRecord.getCreateDateTimeStart(), - mesProdBindRecord.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProdBindRecord.getCreateDateTimeStart(), + mesProdBindRecord.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } /** - * 物料追溯 + * 包装明细 * * @param ifPackageDetail * @param organizeCode @@ -1946,10 +1935,10 @@ public class MesHqlPack { public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode); if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean); } if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) { DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean); @@ -1966,10 +1955,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) { DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean); } - DdlPreparedPack.timeBuilder( - mesRepairRecord.getCreateDateTimeStart(), - mesRepairRecord.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesRepairRecord.getCreateDateTimeStart(), + mesRepairRecord.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } @@ -1983,15 +1974,15 @@ public class MesHqlPack { public static DdlPackBean getMesQcCheckData(MesQcCheckData mesQcCheckData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckData, organizeCode); if (!StringUtils.isEmpty(mesQcCheckData.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesQcCheckData.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesQcCheckData.getOrderNo(), "orderNo", packBean); } if (!StringUtils.isEmpty(mesQcCheckData.getSn())) { - DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean); + DdlPreparedPack.getStringEqualPack(mesQcCheckData.getSn(), "sn", packBean); } - if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) { + if (mesQcCheckData.getCheckType() != null) { DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean); } if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) { @@ -2000,10 +1991,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckData.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCellCode(), "workCellCode", packBean); } - DdlPreparedPack.timeBuilder( - mesQcCheckData.getCreateDateTimeStart(), - mesQcCheckData.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesQcCheckData.getCreateDateTimeStart(), + mesQcCheckData.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } @@ -2020,13 +2013,13 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSnTravel.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProduceSnTravel.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean); } if (!StringUtils.isEmpty(mesProduceSnTravel.getProductSn())) { - DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getProductSn(), "productSn", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), "workCellCode", packBean); @@ -2043,10 +2036,12 @@ public class MesHqlPack { if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } - DdlPreparedPack.timeBuilder( - mesProduceSnTravel.getCreateDateTimeStart(), - mesProduceSnTravel.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSnTravel.getCreateDateTimeStart(), + mesProduceSnTravel.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } @@ -2100,6 +2095,7 @@ public class MesHqlPack { /** * JIS发运模式 + * * @param patternJis * @param organizeCode * @return @@ -2109,8 +2105,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(patternJis.getPatternNo())) { DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean); } - if (!StringUtils.isEmpty(patternJis.getTopNo())) { - DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean); + if (!StringUtils.isEmpty(patternJis.getQueueNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getQueueNo(), "queueNo", packBean); } if (!StringUtils.isEmpty(patternJis.getHandleNo())) { DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean); @@ -2121,5 +2117,51 @@ public class MesHqlPack { return packBean; } + /** + * 监听任务查询条件封装 + * + * @param monitorTask + * @param organizeCode + * @return + */ + public static DdlPackBean getMesMonitorTask(MesMonitorTask monitorTask, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(monitorTask.getTaskNo())) { + DdlPreparedPack.getStringLikerPack(monitorTask.getTaskNo(), "taskNo", packBean); + } + if (!StringUtils.isEmpty(monitorTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(monitorTask.getTaskName(), "taskName", packBean); + } + if (!StringUtils.isEmpty(monitorTask.getTaskObjectType())) { + DdlPreparedPack.getNumEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean); + } + if (!StringUtils.isEmpty(monitorTask.getTaskStatus())) { + DdlPreparedPack.getNumEqualPack(monitorTask.getTaskStatus(), "taskStatus", packBean); + } + if (monitorTask.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(monitorTask.getIsValid(), "isValid", packBean); + } + return packBean; + } + /** + * 监听任务明细查询条件封装 + * + * @param monitorTaskDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesMonitorTaskDetail(MesMonitorTaskDetail monitorTaskDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(monitorTaskDetail.getTaskNo())) { + DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getTaskNo(), "taskNo", packBean); + } + if (!StringUtils.isEmpty(monitorTaskDetail.getDataObjectNo())) { + DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getDataObjectNo(), "dataObjectNo", packBean); + } + if (monitorTaskDetail.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getIsValid(), "isValid", packBean); + } + return packBean; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java index f03e4f7..907b15a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java @@ -30,6 +30,9 @@ public class ClassFieldModel implements Serializable { @ApiParam(value ="属性名") private String fieldName; + @ApiParam(value ="字段名称") + private String fieldColumnName; + @ApiParam(value ="属性类型名称") private String fieldTypeName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java index 73d61dd..e601f37 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java @@ -40,6 +40,9 @@ public class ClassModel implements Serializable { @ApiParam(value ="类名") private String clzSimpleName; + @ApiParam(value ="表名称名") + private String clzTableName; + @ApiParam(value ="类全名") private String clzFullName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java new file mode 100644 index 0000000..c9c9845 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.wms.bean.WmsPackage; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : qianHuaSheng + * @CreateDate : 2019-06-06 15:40 + * @Modify: + **/ +@Data +public class WmsPackageModel { + + List wmsPackageList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java index e3dc2fc..e23b1ad 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.report; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -17,7 +18,8 @@ public class BrDataSourceModel { /** * 默认数据源信息 */ - public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", null, null, "使用默认数据源"); + public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", + CommonEnumUtil.DATA_SOURCE_TYPE.SOURCE_MARIA_DB.getValue(), null, "使用默认数据源"); @ApiParam(value ="数据源名称") private String sourceName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index 67bd9b5..2a28c0f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.report; import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.report.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -71,18 +72,18 @@ public class TemplateModel implements Serializable { @ApiParam(value = "跨服务调用解析后数据") private Object option; + @ApiParam(value = "分页参数") + private Pager pager; + @ApiParam(value = "页面查询条件") private Map findParam; @ApiParam("执行 HQL ") - private String selectHql; + private String selectSql; + + @ApiParam("执行 HQL 返回数量") + private String countSql; @ApiParam("执行 HQL 返回数量") - private String countHql; -// -// @ApiParam("执行 HQL 参数名称 ") -// private String[] paramName; -// -// @ApiParam("执行 HQL 参数值 ") -// private Object[] paramValue; + private String querySql; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index c9a988d..417c5f1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -69,6 +69,10 @@ public class PrintOrderDataModel implements Serializable { @Transient public String vendorEmail; + @ApiParam(value = "集装箱号") + @Transient + public String containerNo; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java index 9330c69..c492ccd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange; import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -19,6 +20,9 @@ public class WmsCSOrderMasterModel implements Serializable { @ApiParam("盘点订单主表") public List wmsCSOrderMasterList; + @ApiParam("盘点调差表") + public List wmsCSAdjustRangeList; + @ApiParam("工厂代码") public String organizeCode; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCsStatusModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCsStatusModel.java new file mode 100644 index 0000000..b650298 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCsStatusModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 3D可视化仓库-盘点状况分布图交互数据模型 + * @Reference + * @Author dragon + * @CreateDate 2020/2/21 18:39 + * @Modify + */ +@Data +public class WmsCsStatusModel implements Serializable { + private static final long serialVersionUID = 1321068307797279909L; + + private List noInventoryLocateList; + + private List factTransLocateList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java index ecbf355..3eb65ad 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; -import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.NoArgsConstructor; @@ -27,8 +27,12 @@ public class WmsFieldInfoModel implements Serializable { @ApiParam(value = "新增数据操作类") private String baseRepository; - public WmsFieldInfoModel (String baseRepository, List wmsFieldInfoList) { + @ApiParam("处理类型") + private int handleType; + + public WmsFieldInfoModel (String baseRepository, int handleType, List wmsFieldInfoList) { this.baseRepository = baseRepository; this.wmsFieldInfoList = wmsFieldInfoList; + this.handleType = handleType; } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 0a11f26..1ae6931 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsListElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -25,7 +25,7 @@ public class WmsListElementModel extends BaseBean { @ApiParam(value = "用户编号") private String userCode; - @ApiParam(value = "是否默认配置") + @ApiParam(value = "是否默认配置 1-默认，2-自定义") private Integer isDefault; List wmsListElementList; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java index c6d2d19..3f75a3f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,6 +18,7 @@ public class WmsLogInfoSendToMqModel implements Serializable { private int handleType; @ApiParam("日志对象DAO层") private String baseRepository; + @JsonDeserialize(as = WmsActionLogData.class) @ApiParam("日志对象（新增）") private BaseBean logBean; @ApiParam("查询条件名称（修改）") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java new file mode 100644 index 0000000..c198e17 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.wms; + + +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 批量修改修改条码打印数量 + * @author puxiao.liao + */ +@Data +public class WmsPoSnPrintModel implements Serializable { + + private static final long serialVersionUID = 5306382160072353831L; + + @ApiParam("数量") + private Double qty; + + @ApiParam("打印条码") + private List wmsStockSnList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 0056ba7..185bfe5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +34,9 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; + @ApiParam(value = "搜索名称") + private String searchName; + @ApiParam(value = "Wms查询元素列表") private List searchElementList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java new file mode 100644 index 0000000..dbcfbd7 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : WMS列表搜索model + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +public class WmsSearchGroupModel { + + @ApiParam(value = "组列表") + private List searchElementModelList; + + @ApiParam(value = "排序参数") + private String orderByParams; + + @ApiParam(value = "分页组件") + private Pager pager; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index fac11e3..e55cf6c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -32,8 +32,8 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("关联单号") public String refSrc; - @ApiParam(value = "关联单据业务类型") - private String busiTypeDesc; + @ApiParam(value = "关联单据业务类型代码") + private String busiTypeCode; @ApiParam(value = "计划日期") private String zdate; @@ -59,18 +59,21 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "创建人") public String createUser; + @ApiParam(value = "关联单据类型") + public String refType; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, - String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo, + String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, String createDatetime, String srcZoneNo, String createUser) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; this.transTypeCode = transTypeCode; this.refSrc = refSrc; - this.busiTypeDesc = busiTypeDesc; + this.busiTypeCode = busiTypeCode; this.zdate = zdate; this.ztime = ztime; this.custNo = custNo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsThreeDimenZoneModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsThreeDimenZoneModel.java new file mode 100644 index 0000000..567bd54 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsThreeDimenZoneModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsFurniture; +import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; +import cn.estsh.i3plus.pojo.wms.bean.WmsZones; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 3D存储区MoDel + * @Reference + * @Author dragon + * @CreateDate 2019/10/18 1:18 + * @Modify + */ +@Data +public class WmsThreeDimenZoneModel implements Serializable { + private static final long serialVersionUID = -5490167040159056107L; + private WmsZones wmsZones; + private List furnitureList; + private List locateList; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java index 366a100..b712a37 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,6 +29,7 @@ import javax.persistence.Table; public class SysTask extends BaseBean { private static final long serialVersionUID = -4462661508105857312L; + @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 4b67424..44ddce3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -718,6 +718,7 @@ public class CoreHqlPack { HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result); HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result); + HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result); HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result); // 添加默认排序 @@ -832,7 +833,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result); @@ -877,7 +878,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate); // hql拼接 DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml new file mode 100644 index 0000000..0db7b7d --- /dev/null +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -0,0 +1,22 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-TEST-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-ptl + jar + + + + i3plus.pojo + i3plus-pojo-base + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java new file mode 100644 index 0000000..41f39d8 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.ptl.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 org.springframework.data.annotation.Transient; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTION_MODULE") +@EqualsAndHashCode(callSuper = true) +@Api("作业组件") +public class PtlActionModule extends BaseBean implements Serializable { + private static final long serialVersionUID = 4734809867665293289L; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "AM_NAME") + @ApiParam("组件名称") + private String amName; + + @Column(name = "AM_DESC") + @ApiParam("组件描述") + private String amDesc; + + @Column(name = "CALL_CLASS") + @ApiParam("实现类") + private String callClass; + + @Column(name = "AM_TYPE") + @ApiParam("组件类型") + private Integer amType; + + @Transient + @ApiParam("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java new file mode 100644 index 0000000..44fb849 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTION_MODULE_GROUP") +@EqualsAndHashCode(callSuper = true) +@Api("组件集") +public class PtlActionModuleGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 5581772484177493182L; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "SEQ") + @ApiParam("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java new file mode 100644 index 0000000..cbe7f0a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTION_ROUTE") +@EqualsAndHashCode(callSuper = true) +@Api("作业流程") +public class PtlActionRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = 6246614708550175795L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_NAME") + @ApiParam("流程名称") + private String routeName; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型") + private Integer routeType; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java new file mode 100644 index 0000000..43d20b5 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTOR") +@EqualsAndHashCode(callSuper = true) +@Api("ACTOR信息") +public class PtlActor extends BaseBean implements Serializable { + private static final long serialVersionUID = 5647053475810310357L; + + @Column(name = "ACTOR_CODE") + @ApiParam("actor代码") + private String actorCode; + + @Column(name = "ACTOR_NAME") + @ApiParam("actor名称") + private String actorName; + + @Column(name = "ACTOR_Class") + @ApiParam("actor名称") + private String actorClass; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java new file mode 100644 index 0000000..9324978 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTOR_RULE") +@EqualsAndHashCode(callSuper = true) +@Api("ACTOR消息获取规则") +public class PtlActorRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -1515292442151992142L; + + @Column(name = "ACTOR_CODE") + @ApiParam("actor代码") + private String actorCode; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "SPECIFIC_RULE") + @ApiParam("特定条件") + private String specificRule; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java new file mode 100644 index 0000000..6ed50ee --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA") +@EqualsAndHashCode(callSuper = true) +@Api("区域") +public class PtlArea extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596443841199197995L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java new file mode 100644 index 0000000..b043598 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_ROUTE") +@EqualsAndHashCode(callSuper = true) +@Api("区域作业流程") +public class PtlAreaRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = -9139851888717990905L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型") + private Integer routeType; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java new file mode 100644 index 0000000..8c44e69 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_SECTION_TASK") +@EqualsAndHashCode(callSuper = true) +@Api("区段亮灯任务") +public class PtlAreaSectionTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 1453616567666404664L; + + @Column(name = "SECTION_TASK_NO") + @ApiParam("区段任务编号") + private String sectionTaskNo; + + @Column(name = "AREA_TASK_NO") + @ApiParam("区域任务编号") + private String areaTaskNo; + + @Column(name = "SECTION_NO") + @ApiParam("区段编号") + private String sectionNo; + + @Column(name = "AREA_NO") + @ApiParam("区域编号") + private String areaNo; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品组代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME") + @ApiParam("产品组名称") + private String prodCfgName; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "VIN_CODE") + @ApiParam("VIN号") + private String vinCode; + + @Column(name = "DETAIL_SEQ") + @ApiParam("明细顺序号") + private Integer detailSeq; + + @Column(name = "PART_LOCATION") + @ApiParam("产品位置") + private String partLocation; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "STATUS") + @ApiParam("区段任务状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java new file mode 100644 index 0000000..60f05df --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_SECTION_TASK_DETAIL") +@EqualsAndHashCode(callSuper = true) +@Api("区段亮灯任务明细") +public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -7563481752643393714L; + + @Column(name = "SECTION_TASK_NO") + @ApiParam("区段任务编号") + private String sectionTaskNo; + + @Column(name = "SECTION_NO") + @ApiParam("区段编号") + private String sectionNo; + + @Column(name = "AREA_NO") + @ApiParam("区域编号") + private String areaNo; + + @Column(name = "CONTROL_NO") + @ApiParam("控制器编号") + private String controlNo; + + @Column(name = "TAG_NO") + @ApiParam("标签编号") + private Integer tagNo; + + @Column(name = "TAG_TYPE") + @ApiParam("标签类型") + private Integer tagType; + + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "QTY") + @ApiParam("拣货数量") + private Integer qty; + + @Column(name = "LIGHT_MODE") + @ApiParam("亮灯方式") + private Integer lightMode; + + @Column(name = "LIGHT_COLOR") + @ApiParam("亮灯颜色") + private Integer lightColor; + + @Column(name = "IS_BUZZING") + @ApiParam("是否蜂鸣") + private Integer isBuzzing; + + @Column(name = "MUSIC_TYPE") + @ApiParam("音乐类型") + private Integer musicType; + + @Column(name = "DISPLAY_CONTENT") + @ApiParam("显示内容") + private String displayContent; + + @Column(name = "BIN_NO") + @ApiParam("bin位代码") + private String binNo; + + @Column(name = "STATUS") + @ApiParam("任务状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java new file mode 100644 index 0000000..c2949dd --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_TASK") +@EqualsAndHashCode(callSuper = true) +@Api("区域亮灯任务") +public class PtlAreaTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 1188465976922660834L; + + @Column(name = "AREA_TASK_NO") + @ApiParam("区域任务编号") + private Long areaTaskNo; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "TASK_NO") + @ApiParam("主任务编号") + private String taskNo; + + @Column(name = "SEQ") + @ApiParam("主任务顺序号") + private Integer seq; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品组代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME") + @ApiParam("产品组名称") + private String prodCfgName; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户识别号") + private String custFlagNo; + + @Column(name = "VIN_CODE") + @ApiParam("VIN号") + private String vinCode; + + @Column(name = "DETAIL_SEQ") + @ApiParam("明细顺序号") + private Integer detailSeq; + + @Column(name = "PART_LOCAION") + @ApiParam("产品位置") + private String partLocation; + + @Column(name = "SN") + @ApiParam("产品代码") + private String sn; + + @Column(name = "TASK_TYPE") + @ApiParam("任务类型") + private String taskType; + + @Column(name = "STATUS") + @ApiParam("任务状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java new file mode 100644 index 0000000..5570ddc --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_TASK_SEQ") +@EqualsAndHashCode(callSuper = true) +@Api("区域任务进度") +public class PtlAreaTaskSeq extends BaseBean implements Serializable { + private static final long serialVersionUID = 7138688457410728493L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "SEQ") + @ApiParam("主任务顺序号") + private Integer seq; + + @Column(name = "DETAIL_SEQ") + @ApiParam("明细顺序号") + private Integer detailSeq; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java new file mode 100644 index 0000000..b70e8ff --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; +import java.io.Serializable; +import java.util.Date; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_BOM") +@EqualsAndHashCode(callSuper = true) +public class PtlBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -4459081803170156825L; + + @Column(name = "PART_NO") + @ApiParam("父物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("父物料描述") + private String partName; + + @Column(name = "UNIT") + @ApiParam("计量单位") + private String unit; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料描述") + private String itemPartName; + + @Column(name = "ITEM_UNIT") + @ApiParam("子计量单位") + private String itemUnit; + + @Column(name = "ITEM_QTY") + @ApiParam("子用量") + private Integer itemQty; + + @Column(name = "BOM_NUM") + @ApiParam("BOM编号") + private String bomNum; + + @Column(name = "BOM_VERSION") + @ApiParam("BOM版本号") + private String bomVersion; + + @Column(name = "EFF_START_TIME") + @ApiParam("有效起始日期") + private Date effStartTime; + + @Column(name = "EFF_END_TIME") + @ApiParam("有效截止日期") + private Date effEndTime; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java new file mode 100644 index 0000000..aff681a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_CONTROL") +@EqualsAndHashCode(callSuper = true) +@Api("控制器") +public class PtlControl extends BaseBean implements Serializable { + private static final long serialVersionUID = -5371842196308816310L; + + @Column(name = "CONTROL_NO") + @ApiParam("控制器编号") + private String controlNo; + + @Column(name = "CONTROL_NAME") + @ApiParam("控制器名称") + private String controlName; + + @Column(name = "CONTROL_TYPE") + @ApiParam("控制器类型") + private Integer controlType; + + @Column(name = "IP") + @ApiParam("ip地址") + private String ip; + + @Column(name = "PORT") + @ApiParam("端口地址") + private String port; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "STATUS") + @ApiParam("控制器状态") + private Integer status; + + @Column(name = "FREQUENCY") + @ApiParam("监听频率") + private Integer frequency; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java new file mode 100644 index 0000000..f11b596 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:18 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ELEMENT") +@EqualsAndHashCode(callSuper = true) +@Api("元素") +public class PtlElement extends BaseBean implements Serializable { + private static final long serialVersionUID = 5562337056340313246L; + + @Column(name = "ELEMENT_NO") + @ApiParam("元素代码") + private String elementNo; + + @Column(name = "ELEMENT_NAME") + @ApiParam("元素名称") + private String elementName; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java new file mode 100644 index 0000000..30025bc --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:19 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ELEMENT_ATTRIBUTE") +@EqualsAndHashCode(callSuper = true) +@Api("元素属性") +public class PtlElementAttribute extends BaseBean implements Serializable { + private static final long serialVersionUID = 4591354414381724731L; + + @Column(name = "ELEMENT_NO") + @ApiParam("元素代码") + private String elementNo; + + @Column(name = "ATTRIBUTE_NO") + @ApiParam("属性代码") + private String attributeNo; + + @Column(name = "ATTRIBUTE_NAME") + @ApiParam("属性名称") + private String attributeName; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java new file mode 100644 index 0000000..a74cab7 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:15 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_INTERFACE") +@EqualsAndHashCode(callSuper = true) +@Api("界面") +public class PtlInterface extends BaseBean implements Serializable { + private static final long serialVersionUID = 5905965593463421411L; + + @Column(name = "INTERFACE_NO") + @ApiParam("界面代码") + private String interfaceNo; + + @Column(name = "INTERFACE_NAME") + @ApiParam("界面名称") + private String interfaceName; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java new file mode 100644 index 0000000..56c2b50 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:21 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_INTERFACE_ELEMENT") +@EqualsAndHashCode(callSuper = true) +@Api("界面元素") +public class PtlInterfaceElement extends BaseBean implements Serializable { + private static final long serialVersionUID = -8436630151033411240L; + + @Column(name = "INTERFACE_NO") + @ApiParam("界面代码") + private String interfaceNo; + + @Column(name = "ELEMENT_NO") + @ApiParam("元素代码") + private String elementNo; + + @Column(name = "FEEDBACK_ELEMENT") + @ApiParam("界面代码") + private String feedbackElement; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java new file mode 100644 index 0000000..445b8f2 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:22 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_INTERFACE_ELEMENT_ATTRIBUTE") +@EqualsAndHashCode(callSuper = true) +@Api("界面元素属性") +public class PtlInterfaceElementAttribute extends BaseBean implements Serializable { + private static final long serialVersionUID = 6603839514256277172L; + + @Column(name = "INTERFACE_NO") + @ApiParam("界面代码") + private String interfaceNo; + + @Column(name = "ATTRIBUTE_NO") + @ApiParam("属性代码") + private String attributeNo; + + @Column(name = "ATTRIBUTE_VALUE") + @ApiParam("属性值") + private String attributeValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java new file mode 100644 index 0000000..41fc4d0 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_MAIN_TASK") +@EqualsAndHashCode(callSuper = true) +@Api("主任务") +public class PtlMainTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 7144785793974319891L; + + @Column(name = "TASK_NO") + @ApiParam("主任务编号") + private String taskNo; + + @Column(name = "SEQ") + @ApiParam("主任务顺序号") + private Integer seq; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; + + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品组代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME") + @ApiParam("产品组名称") + private String prodCfgName; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "VIN_CODE") + @ApiParam("VIN号") + private String vinCode; + + @Column(name = "DETAIL_SEQ") + @ApiParam("明细顺序号") + private Integer detailSeq; + + @Column(name = "PART_LOCATION") + @ApiParam("产品位置") + private String partLocation; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "TASK_TYPE") + @ApiParam("任务类型") + private String taskType; + + @Column(name = "STATUS") + @ApiParam("任务状态") + private Integer status; + + @Column(name = "TASK_SRC") + @ApiParam("任务来源") + private String taskSrc; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java new file mode 100644 index 0000000..70d99c0 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_MESSAGE_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("消息类型") +public class PtlMessageType extends BaseBean implements Serializable { + private static final long serialVersionUID = -8899362292879155612L; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "MT_NAME") + @ApiParam("消息类型名称") + private String mtName; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java new file mode 100644 index 0000000..6339bca --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_MESSAGE_TYPE_FORMAT") +@EqualsAndHashCode(callSuper = true) +@Api("消息类型格式") +public class PtlMessageTypeFormat extends BaseBean implements Serializable { + private static final long serialVersionUID = 3398977445081168030L; + + @Column(name = "MT_CODE") + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "FIELD_CODE") + @ApiParam("属性代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("属性名称") + private String fieldName; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java new file mode 100644 index 0000000..6222e0a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ROUTE_STATUS") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态") +public class PtlRouteStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = -2862693366302428501L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Long actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入状态调用") + private Long inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开状态调用") + private Long outAmgId; + + @Column(name = "STATUS_TYPE") + @ApiParam("状态类型") + private Integer statusType; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java new file mode 100644 index 0000000..41c6497 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_SECTION") +@EqualsAndHashCode(callSuper = true) +@Api("区段") +public class PtlSection extends BaseBean implements Serializable { + private static final long serialVersionUID = -7451758045686558883L; + + @Column(name = "SECTION_NO") + @ApiParam("区段编号") + private String sectionNo; + + @Column(name = "SECTION_NAME") + @ApiParam("区段名称") + private String sectionName; + + @Column(name = "SECTION_SEQ") + @ApiParam("区段顺序号") + private Integer sectionSeq; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java new file mode 100644 index 0000000..9edeec3 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -0,0 +1,93 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_TAG") +@EqualsAndHashCode(callSuper = true) +@Api("标签信息") +public class PtlTag extends BaseBean implements Serializable { + private static final long serialVersionUID = -949910394508157581L; + + @Column(name = "TAG_NO") + @ApiParam("标签代码") + private Integer tagNo; + + @Column(name = "CONTROL_NO") + @ApiParam("控制器代码") + private String controlNo; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "SECTION_NO") + @ApiParam("区段代码") + private String sectionNo; + + @Column(name = "PART_NO") + @ApiParam("物料编号") + private String partNo; + + @Column(name = "BIN_NO") + @ApiParam("BIN位代码") + private String binNo; + + @Column(name = "TAG_TYPE") + @ApiParam("标签类型") + private Integer tagType; + + @Column(name = "LIGHT_STATUS") + @ApiParam("亮灯状态") + private Integer lightStatus; + + @Column(name = "TAG_STATUS") + @ApiParam("标签状态") + private Integer tagStatus; + + @Column(name = "LIGHT_MODE") + @ApiParam("亮灯状态") + private Integer lightMode; + + @Column(name = "LIGHT_COLOR") + @ApiParam("亮灯颜色") + private Integer lightColor; + + @Column(name = "IS_BUZZING") + @ApiParam("是否蜂鸣") + private Integer isBuzzing; + + @Column(name = "MUSIC_TYPE") + @ApiParam("音乐类型") + private Integer musicType; + + @Column(name = "DISPLAY_CONTEXT") + @ApiParam("显示内容") + private String displayContent; + + @Column(name = "ERROR_COUNT") + @ApiParam("卡键次数") + private Integer errorCount; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java new file mode 100644 index 0000000..5f056b7 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="PTL_TEST_USER") +@Api(value="PTL 测试用户",description = "测试用户") +public class PtlTestUser extends BaseBean { + + private static final long serialVersionUID = -130240511327784335L; + + + @Column(name="USER_INFO_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userInfoId; + + @Column(name="LANGUAGE_CODE") + @ApiParam(value ="用户语言") + private String languageCode; + + @Column(name="USER_NAME_RDD") + @ApiParam(value ="用户名称" , access ="账号名称") + private String userName; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @Column(name="USER_EMP_NO") + @ApiParam(value ="工号") + private String userEmpNo; + + @Column(name="USER_LOGIN_PASSWORD") + @ApiParam(value ="登陆密码") + private String userLoginPassword; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + + @Column(name="USER_EMAIL") + @ApiParam(value ="邮箱" , access ="邮箱") + private String userEmail; + + @Column(name="USER_PHONE") + @ApiParam(value ="手机号" , access ="手机号") + private String userPhone; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java new file mode 100644 index 0000000..e2a1467 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/2/12 18:18 + * @desc + */ +@Data +@ApiModel("作业组件model") +public class ActionModuleModel { + + @ApiModelProperty("组件代码") + private String amCode; + + @ApiModelProperty("调用类") + private String callClass; + + @ApiModelProperty("是否完成") + private Boolean isComplete; + + @ApiModelProperty("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java new file mode 100644 index 0000000..3a1e7fe --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * @author Wynne.Lu + * @date 2020/2/13 19:31 + * @desc + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +@ApiModel("actor消息类型及属性") +public class ActorMessageModel { + + @ApiModelProperty("消息类型代码") + private String mtCode; + + @ApiModelProperty("消息类型名称") + private String mtName; + + @ApiModelProperty("属性代码") + private String fieldCode; + + @ApiModelProperty("属性名称") + private String fieldName; + + @ApiModelProperty("actor代码") + private String actorCode; + + @ApiModelProperty("特定条件") + private String specificRule; + + @ApiModelProperty("actor类") + private String actorClass; + + @ApiModelProperty("工厂") + private String organizeCode; + + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java new file mode 100644 index 0000000..1cb36c9 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class AttrModel implements Serializable { + private static final long serialVersionUID = -4842958192243396773L; + + @ApiParam("属性名称") + private String attrName; + + @ApiParam("属性名称别名") + private String attrNameAlias; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java new file mode 100644 index 0000000..34116b7 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@ApiModel("通用数据传输对象") +public class CommonMsgModel implements Serializable { + private static final long serialVersionUID = 6359899762200319607L; + + @ApiModelProperty("工厂") + private String organizeCode; + + @ApiModelProperty("用户信息") + private String userInfo; + + @ApiModelProperty("消息类型") + private String msgType; + + @ApiModelProperty("消息数据") + private Map msgData; + + @ApiModelProperty("客户端信息") + private String clientInfo; + + @ApiModelProperty("websocket消息") + private WsResultBean wsResultBean; + + @ApiModelProperty("流程状态集合") + private List routeStatusList; + + @ApiModelProperty("当前流程状态") + private PtlRouteStatus curRouteStatus; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java new file mode 100644 index 0000000..549116a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/15 15:42 + * @desc + */ +@Data +@ToString +public class LightOnModel implements Serializable { + private static final long serialVersionUID = -1089361557513425229L; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java new file mode 100644 index 0000000..4e83d86 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/2/14 15:30 + * @desc + */ +@Data +@ApiModel("特定条件model") +public class SpecificRuleModel implements Serializable { + private static final long serialVersionUID = -4724747574943605500L; + + private List kList=new ArrayList<>(); + + private Map kvMap=new HashMap<>(); +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java new file mode 100644 index 0000000..1dff444 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 工位结果bean + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-24 + * @Modify: + **/ +@Data +public class WsResultBean implements Serializable { + + /** + * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 + * moduleContent组件内容,taskComplete整个扫描完成 + */ + @ApiParam("业务类型") + private String busiType; + + /** + * 对于相同业务类型的数据，区分不同数据类型。 + * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， + * image-图片 + */ + @ApiParam("数据类型") + private String dataType; + + @ApiParam("执行结果信息") + private String message; + + @ApiParam("List结果集") + private List resultList; + + @ApiParam("结果对象") + private Object resultObj; + + @ApiParam("Map结果集") + public Map resultMap; + + @ApiParam("List结果集的属性") + private List dataAttrList; + + @ApiParam("图片路径") + private String imageUrl; + + @ApiParam("多个数据集") + private List> wsResultBeans; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java new file mode 100644 index 0000000..70b4956 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java @@ -0,0 +1,14 @@ +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:19 + * @Modify: + **/ +package cn.estsh.i3plus.pojo.ptl; + +/** + * Bean对象包说明 cn.estsh.i3plus.pojo.ptl.bean + * 创建Bean 以Ptl 开头 + * Bean 必须实现序列号ID (未实现会造成序列化问题) + */ \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleGroupRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleGroupRepository.java new file mode 100644 index 0000000..dc1b478 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleGroupRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModuleGroup; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionModuleGroupRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleRepository.java new file mode 100644 index 0000000..06450b9 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModule; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionModuleRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActorRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActorRepository.java new file mode 100644 index 0000000..ec32a90 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActorRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActor; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActorRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActorRuleRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActorRuleRepository.java new file mode 100644 index 0000000..33aaa64 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActorRuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActorRule; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActorRuleRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRouteRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRouteRepository.java new file mode 100644 index 0000000..0c2f049 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRouteRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaRoute; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlAreaRouteRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskDetailRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskDetailRepository.java new file mode 100644 index 0000000..453a92b --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskDetailRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaSectionTaskDetail; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlAreaSectionTaskDetailRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlControlRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlControlRepository.java new file mode 100644 index 0000000..e6c278d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlControlRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlControl; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlControlRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlElementRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlElementRepository.java new file mode 100644 index 0000000..19811e5 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlElementRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlElement; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ +public interface PtlElementRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlInterfaceElementRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlInterfaceElementRepository.java new file mode 100644 index 0000000..99389a3 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlInterfaceElementRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlInterfaceElement; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ +public interface PtlInterfaceElementRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlInterfaceRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlInterfaceRepository.java new file mode 100644 index 0000000..1e8e490 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlInterfaceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlInterface; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ +public interface PtlInterfaceRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMessageTypeFormatRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMessageTypeFormatRepository.java new file mode 100644 index 0000000..24d5657 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMessageTypeFormatRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlMessageTypeFormat; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlMessageTypeFormatRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMessageTypeRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMessageTypeRepository.java new file mode 100644 index 0000000..17d6367 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMessageTypeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlMessageType; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlMessageTypeRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusRepository.java new file mode 100644 index 0000000..be4c41a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlRouteStatusRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTagRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTagRepository.java new file mode 100644 index 0000000..e0c6ecd --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTagRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlTag; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlTagRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java new file mode 100644 index 0000000..91896ed --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlTestUser; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:18 + * @Modify: + **/ +public interface PtlTestUserRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java index c84d42e..b114e73 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java @@ -55,21 +55,21 @@ public class BrPojo extends BaseBean { @ApiParam(value ="数据源编码") private String sourceCode; + @Column(name="SOURCE_TYPE") + @ApiParam(value ="数据源类型") + private Integer sourceType; + @Column(name="SOURCE_NAME") @ApiParam(value ="数据源名称") private String sourceName; - @Column(name="POJO_PACKAGE_CODE") - @ApiParam(value ="对象全路径") - private String pojoPackageCode; - - @Column(name="POJO_CODE") - @ApiParam(value ="对象代码") - private String pojoCode; + @Column(name="POJO_TABLE_NAME") + @ApiParam(value ="对象表名称") + private String pojoTableName; - @Column(name="POJO_CODE_ALIAS") - @ApiParam(value ="对象别名") - private String pojoCodeAlias; + @Column(name="POJO_TABLE_NAME_ALIAS") + @ApiParam(value ="对象表别名") + private String pojoTableNameAlias; @Column(name="pojo_name") @ApiParam(value ="对象名称") @@ -79,9 +79,9 @@ public class BrPojo extends BaseBean { @ApiParam(value ="对象排序") private Integer pojoSort; - @Column(name="POJO_ATTR") + @Column(name="POJO_COLUMN_NAME") @ApiParam(value ="连接属性") - private String pojoAttr; + private String pojoColumnName; @Column(name="JOIN_TYPE") @ApiParam(value ="连接关系") @@ -107,20 +107,20 @@ public class BrPojo extends BaseBean { private String joinPojoNameRdd; @Column(name="JOIN_POJO_CODE_RDD") - @ApiParam(value ="连接对象代码") - private String joinPojoCodeRdd; + @ApiParam(value ="连接对象名称") + private String joinTableNameRdd; @Column(name="JOIN_POJO_CODE_ALIAS_RDD") - @ApiParam(value ="连接对象别名") - private String joinPojoCodeAliasRdd; + @ApiParam(value ="连接对象表别名") + private String joinTableNameAliasRdd; - @Column(name="JOIN_POJO_ATTR") - @ApiParam(value ="连接对象属性") - private String joinPojoAttr; + @Column(name="JOIN_COLUMN_NAME") + @ApiParam(value ="连接字段名称") + private String joinColumnName; - @Column(name="POJO_HQL") + @Column(name="POJO_SQL") @ApiParam(value ="对象名称") - private String pojoHql; + private String pojoSql; @Column(name="POJO_DESCRIPTION") @ApiParam(value ="对象描述") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index 49b0c09..9a055dd 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -52,17 +52,17 @@ public class BrPojoAttr extends BaseBean { @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") private String packageNameRdd; - @Column(name="POJO_NAME_ALIAS") + @Column(name="POJO_TABLE_NAME_ALIAS") @ApiParam(value ="对象别名") - private String pojoNameAlias; + private String pojoTableNameAlias; - @Column(name="ATTR_NAME") + @Column(name="ATTR_COLUMN_NAME") @ApiParam(value ="属性别名") - private String attrName; + private String attrColumnName; - @Column(name="ATTR_NAME_ALIAS") + @Column(name="ATTR_COLUMN_NAME_ALIAS") @ApiParam(value ="属性别名") - private String attrNameAlias; + private String attrColumnNameAlias; @Column(name="PARENT_ID") @ApiParam(value ="上级ID",example = "-1") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java index 20d9181..cec0847 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -53,21 +53,25 @@ public class BrPojoFilterAttr extends BaseBean { @ApiParam(value ="对象名称") private String pojoNameRdd; - @Column(name="POJO_CODE_RDD") - @ApiParam(value ="对象代码") - private String pojoCodeRdd; + @Column(name="POJO_TABLE_NAME_RDD") + @ApiParam(value ="对象表名称") + private String pojoTableNameRdd; - @Column(name="POJO_CODE_ALIAS_RDD") + @Column(name="POJO_TABLE_NAME_ALIAS_RDD") @ApiParam(value ="对象别名") - private String pojoCodeAliasRdd; + private String pojoTableNameAliasRdd; - @Column(name="POJO_ATTR") + @Column(name="POJO_COLUMN_NAME") @ApiParam(value ="对象属性") - private String pojoAttr; + private String pojoColumnName; - @Column(name="PACKAGE_POJO_ATTR") +// @Column(name="POJO_CODE_NAME") +// @ApiParam(value ="对象属性") +// private String pojoCodeName; +// + @Column(name="POJO_TABLE_COLUMN_NAME") @ApiParam(value ="对象属性全路径") - private String packagePojoAttr; + private String pojoTableColumnName; /************************************** 属性信息 **************************************/ diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java index e4cbcd3..2b6ccaa 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java @@ -48,21 +48,26 @@ public class BrPojoViewAttr extends BaseBean { @ApiParam(value = "对象名称") private String pojoNameRdd; - @Column(name = "POJO_CODE_RDD") + @Column(name = "POJO_TABLE_NAME_RDD") @ApiParam(value = "对象代码") - private String pojoCodeRdd; + private String pojoTableNameRdd; - @Column(name = "POJO_CODE_ALIAS_RDD") + @Column(name = "POJO_TABLE_NAME_ALIAS_RDD") @ApiParam(value = "对象别名") - private String pojoCodeAliasRdd; + private String pojoTableNameAliasRdd; - @Column(name="POJO_ATTR") + @Column(name="POJO_COLUMN_NAME") @ApiParam(value ="对象属性") - private String pojoAttr; + private String pojoColumnName; - @Column(name="PACKAGE_POJO_ATTR") - @ApiParam(value ="对象属性全路径") - private String packagePojoAttr; + +// @Column(name="POJO_CODE_NAME") +// @ApiParam(value ="对象属性") +// private String pojoCodeName; +// +// @Column(name="PACKAGE_POJO_ATTR") +// @ApiParam(value ="对象属性全路径") +// private String packagePojoAttr; @Column(name="VIEW_ATTR_ALIAS") @ApiParam(value ="视图属性别名") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 025e496..5d5ce2b 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -192,9 +192,9 @@ public class ReportHqlPack { DdlPreparedPack.getNumEqualPack(pojo.getJoinType(),"joinType",result); DdlPreparedPack.getNumEqualPack(pojo.getPojoType(),"pojoType",result); DdlPreparedPack.getNumEqualPack(pojo.getWhereType(),"whereType",result); - DdlPreparedPack.getStringEqualPack(pojo.getPojoCodeAlias(),"pojoCodeAlias",result); + DdlPreparedPack.getStringEqualPack(pojo.getPojoTableNameAlias(),"pojoTableNameAlias",result); DdlPreparedPack.getStringLikerPack(pojo.getPojoName(),"pojoName",result); - DdlPreparedPack.getStringLikerPack(pojo.getPojoCode(),"pojoCode",result); + DdlPreparedPack.getStringLikerPack(pojo.getPojoTableName(),"pojoTableName",result); return result; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index f2a841b..60cabe4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -30,7 +30,7 @@ public class BasCustomer extends BaseBean { private static final long serialVersionUID = -1980207700343546396L; @Column(name = "CUST_NO") - @ApiParam(value = "客户编号") + @ApiParam(value = "客户编码") private String custNo; @Column(name = "CUST_NAME") @@ -54,7 +54,7 @@ public class BasCustomer extends BaseBean { private String custEmail; @Column(name = "CUST_TEL") - @ApiParam(value = "联系人电话") + @ApiParam(value = "电话号码") private String custTel; @Column(name = "CUST_FAX") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java new file mode 100644 index 0000000..dba988a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -0,0 +1,146 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : 包材BOM信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 14:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="QAD_BOP") +@Api("包材BOM信息") +public class QadBop implements Serializable { + + private static final long serialVersionUID = 4673217061075875734L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="BOP_CODE") + @ApiParam("BOP编号") + public String bopCode; + + @Column(name="BOP_DESC") + @ApiParam("BOP描述") + public String bopDesc; + + @Column(name="BOP_DOMAIN") + @ApiParam("BOP所属Domain") + public String bopDomain; + + @Column(name="PARENT_PART") + @ApiParam("父层级packcode对应的qad零件号") + public String parentPart; + + @Column(name="PARENT_RETURN_PART") + @ApiParam("父层级packcode对应的可回用零件号") + public String parentReturnPart; + + @Column(name="BOPDW_QTY") + @ApiParam("默认1 不考虑") + public String bopdwQty; + + @Column(name="SUB_BOP_CODE") + @ApiParam("子层级packcode代码或者是物料零件号") + public String subBopCode; + + @Column(name="SUB_BOP_PART") + @ApiParam("子层级packcode对应的qad零件号，如果是物料零件这里为空") + public String subBopPart; + + @Column(name="SUB_ITEM_PART") + @ApiParam("子层级packcode对应的可回用零件号，如果是物料零件这里为空") + public String subItemPart; + + @Column(name="SUB_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "该层级在父层级中的个数", example = "0") + public String subQty; + + @Column(name="SUB_UNIT") + @ApiParam("单位") + public String subUnit; + + @Column(name="CREATE_DATE_TIME") + @ApiParam("创建时间") + public String createDateTime; + + @Transient + @ApiParam("收货时是供应商编号，发运时是客户发往地") + public String inAddr; + + @Transient + @ApiParam("工厂代码") + public String inSite; + + @ApiParam("父层级packcode代码") + @Column(name="BOPDW_PARENT") + public String bopdwParent; + + public QadBop(){ + + } + + public QadBop(String bopCode, String bopDesc, String bopDomain, String parentPart, String parentReturnPart, String bopdwQty, String subBopCode, String subBopPart, String subItemPart, String subQty, String subUnit, String createDateTime, String inAddr, String inSite) { + this.bopCode = bopCode; + this.bopDesc = bopDesc; + this.bopDomain = bopDomain; + this.parentPart = parentPart; + this.parentReturnPart = parentReturnPart; + this.bopdwQty = bopdwQty; + this.subBopCode = subBopCode; + this.subBopPart = subBopPart; + this.subItemPart = subItemPart; + this.subQty = subQty; + this.subUnit = subUnit; + this.createDateTime = createDateTime; + this.inAddr = inAddr; + this.inSite = inSite; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java new file mode 100644 index 0000000..dfe4dab --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : 零件包装主数据信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 14:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="QAD_ITEM_PACKING") +@Api("零件包装主数据信息") +public class QadItemPacking implements Serializable { + + private static final long serialVersionUID = -9204074690166851001L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="IN_ADDR") + @ApiParam("收货时是供应商编号，发运时是客户发往地") + public String inAddr; + + @Column(name="IN_BOP_CODE") + @ApiParam("BOP编号") + public String inBopCode; + + @Column(name="IN_DOMAIN") + @ApiParam("所属Domain") + public String inDomain; + + @Column(name="IN_PART") + @ApiParam("物料代码") + public String inPart; + + @Column(name="IN_SITE") + @ApiParam("工厂代码") + public String inSite; + + @Column(name="IN_TRANS_TYPE") + @ApiParam("交易类型") + public String inTransType; + + @Column(name="CREATE_DATE_TIME") + @ApiParam("创建时间") + public String createDateTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index 98a40b3..ae8424f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -43,8 +43,29 @@ public class WareHouse extends BaseBean { @ApiParam("仓库地址") public String address; + @Column(name = "WH_LENGTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "长") + private Double whLength; + + @Column(name = "WH_WIDTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "宽") + private Double whWidth; + + @Column(name = "WH_HEIGHT", columnDefinition = "decimal(18,8)") + @ApiParam(value = "高") + private Double whHeight; + @Transient @ApiParam(value ="存储区列表") private List zoneList; + public double getWhLengthVal() { + return this.whLength == null ? 0 : this.whLength.doubleValue(); + } + public double getWhWidthVal() { + return this.whWidth == null ? 0 : this.whWidth.doubleValue(); + } + public double getWhHeightVal() { + return this.whHeight == null ? 0 : this.whHeight.doubleValue(); + } } 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 41e57d1..5528099 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -69,15 +70,14 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private Integer autoInit; - // 1=true, 2 = false - @Column(name = "IS_COMMIT_REF_MOVE", nullable = false) - @ApiParam(value = "是否连带提交创建状态移动单", example = "2") - @AnnoOutputColumn - private Integer isCommitRefMove; + @Column(name = "COMMIT_MODE", nullable = false) + @ApiParam(value = "提交移动单模式") + @AnnoOutputColumn(refClass = WmsEnumUtil.GROUP_COMMIT_MODE.class) + private Integer commitMode; // 1=true, 2 = false @Column(name = "IS_AUTO_COMMIT", nullable = false) - @ApiParam(value = "是否自动提交", example = "1") + @ApiParam(value = "是否自动提交") @AnnoOutputColumn private Integer isAutoCommit; @@ -102,8 +102,8 @@ public class WmsActionGroup extends BaseBean { return this.endAmId == null ? 0 : this.endAmId.longValue(); } - public int getIsCommitRefMoveVal() { - return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + public int getCommitModeVal() { + return this.commitMode == null ? 0 : this.commitMode.intValue(); } public int getIsAutoCommitVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index c08e1eb..69772a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -89,7 +89,7 @@ public class WmsCSFactTrans extends BaseBean { @Transient @AnnoOutputColumn(hidden = true) - @ApiParam(value = "剩余数量", example = "1") + @ApiParam(value = "差异数量", example = "1") public Double surplusQty; @Column @@ -132,12 +132,11 @@ public class WmsCSFactTrans extends BaseBean { * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ @Transient - @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; - @Transient - @AnnoOutputColumn(hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") @ApiParam(value = "条码状态(冻结时)", example = "1") public Integer destSnStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 086e420..1f2f1d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -122,7 +122,7 @@ public class WmsCSOrderDetails extends BaseBean { public Double factQty; @Transient - @ApiParam(value = "剩余数量", example = "1") + @ApiParam(value = "差异数量", example = "1") @AnnoOutputColumn(hidden = true) public Double surplusQty; @@ -207,4 +207,13 @@ public class WmsCSOrderDetails extends BaseBean { this.organizeCode = organizeCode; this.qty=qty; } + + public WmsCSOrderDetails (String orderNo, String partNo,String partNameRdd, String locateNo, double qty, double factQty){ + this.orderNo=orderNo; + this.partNo=partNo; + this.partNameRdd=partNameRdd; + this.qty=qty; + this.factQty=factQty; + this.locateNo=locateNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 8a6afd1..fe8ebc7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -103,6 +103,9 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "is_obvious") private Integer isObvious; + @ApiParam(value = "允许盘入的库位") + @Column(name = "ALLOW_LOCATES") + private String allowLocates; public Integer getIsInventoryVal() { return this.isInventory == null ? 0 :this.isInventory.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index dac3089..7bea734 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -52,14 +53,20 @@ public class WmsCSRange extends BaseBean { @Column(name = "LOCATE_NO") @ApiParam("库位编号") + @AnnoOutputColumn(hidden = true) public String locateNo; @Column(name = "UNIT") @ApiParam("单位") public String unit; + @Column(name="SRC_ORDER_NO") + @ApiParam("原单号") + public String srcOrderNo; + @Transient - @ApiParam("存储区编号") + @ApiParam("存储区编号组") + @AnnoOutputColumn(hidden = true) public String[] zoneNos; public WmsCSRange(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java new file mode 100644 index 0000000..24bf56a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; +import java.io.Serializable; + +/** + * @Description :盘点策略表 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-02-17 10:13 上午 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_CS_STRATEGY", indexes = { +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "盘点策略表", description = "盘点策略表") +public class WmsCsStrategy extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1692487594678973549L; + + @Column(name = "STRATEGY_NAME") + @ApiParam(value = "策略名称") + private String strategyName; + + @Column(name = "part_type") + @ApiParam(value = "物料分类") + private String partType; + + @Column(name = "STRATEGY_TYPE") + @ApiParam(value = "策略分类", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class, refForeignKey = "value", value = "description") + private Integer strategyType; + + @Column(name = "CYCLE_RULE") + @ApiParam(value = "循环规则") + private String cycleRule; + + @Column(name = "START_DATE") + @ApiParam(value = "开始日期", example = "0") + private String startDate; + + @Column(name = "END_DATE") + @ApiParam(value = "结束日期", example = "0") + private String endDate; + + @Column(name = "NUM_MAX") + @ApiParam(value = "明细数量上限") + private Integer numMax; + + @Column(name = "COVERAGE_RATE") + @ApiParam(value = "抽盘覆盖率") + private Double coverageRate; + + @Column(name = "ZONE_NOS") + @ApiParam(value = "存储区") + private String zoneNos; + + @Column(name = "LOCATES") + @ApiParam(value = "盘点库位") + private String locates; + + @Column(name = "last_run_time") + @ApiParam(value = "上次运行时间") + private String lastRunTime; + + @Column(name = "next_run_time") + @ApiParam(value = "下次运行时间") + private String nextRunTime; + + @Column(name = "REMAKE") + @ApiParam(value = "备注") + private String remake; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java index 9038989..34ed123 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java @@ -50,7 +50,7 @@ public class WmsDataMigrationConfig extends BaseBean{ @Column(name="LAST_MRGRATION_QTY") @ApiParam(value = "末次迁移记录数", example = "0") - private Integer LastmMigrationQty; + private Integer lastmMigrationQty; @Column(name="NEXT_EXECUTION_TIME") @ApiParam("下次执行时间") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 379fd9d..9c02389 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -151,6 +151,15 @@ public class WmsDocMovementDetails extends BaseBean { @Column(name = "LOT_NO") @ApiParam("批次") public String lotNo; + + @Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false) + @ApiParam("源单行号") + public String srcItem; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + public String custOrderNo; + @Transient @ApiParam("实际批次") private String actualLot; @@ -218,6 +227,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "汇总拣货数量", example = "0") public Double sumPickQty; + @Transient + @ApiParam("执行状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") + private Integer executeStatus; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 99eb8af..74d1911 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -111,6 +111,7 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; + @Transient private List movementDetailsList; @@ -160,6 +161,15 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "计划时间") private String assignPlanTime; + @Column(name = "TAG") + @ApiParam(value = "标签") + private String tag; + + @Column(name = "IS_SINGLE_STEP") + @ApiParam(value = "一步法/两步法") + @AnnoOutputColumn(refClass = WmsEnumUtil.STEP.class, refForeignKey = "value", value = "description") + private Integer isSingleStep; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; @@ -180,11 +190,15 @@ public class WmsDocMovementMaster extends BaseBean { @Transient public String title; - @Column(name = "TAG") - @ApiParam(value = "标签") - private String tag; + @Transient + @ApiParam("物料编号组") + public String[] partNos; public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } + + public int getBusiTypeVal() { + return this.busiType == null ? 0 : this.busiType; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index d812406..81cd4b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -118,4 +118,12 @@ public class WmsDocMovementSn extends BaseBean { @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; + + @Transient + @ApiParam("客户零件号") + private String customerPartNo; + + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java new file mode 100644 index 0000000..a6f6904 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.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 家具实体 + * @Reference + * @Author dragon + * @CreateDate 2020/2/20 10:42 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_FURNITURE") +@Api("家具表") +public class WmsFurniture extends BaseBean { + private static final long serialVersionUID = -8428899843794155828L; + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区代码") + private String zoneNo; + + @Column(name = "TYPE_CODE") + @ApiParam(value = "家具类型编号") + private String typeCode; + + @Column(name = "FURNITURE_NO") + @ApiParam(value = "家具代码") + private String furnitureNo; + + @Column(name = "IS_SAVE_GOODS") + @ApiParam(value = "是否储物") + private Integer isSaveGoods; + + public int getIsSaveGoodsVal() { + return this.isSaveGoods == null ? 0 : this.isSaveGoods; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java new file mode 100644 index 0000000..2ee5b0f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.wms.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 家具类型实体 + * @Reference + * @Author dragon + * @CreateDate 2020/2/20 10:42 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_FURNITURE_TYPE") +@Api("家具类型表") +public class WmsFurnitureType extends BaseBean { + private static final long serialVersionUID = 3573734032905328327L; + + @Column(name = "TYPE_CODE") + @ApiParam(value = "类型编号") + private String typeCode; + + @Column(name = "TYPE_NAME") + @ApiParam(value = "类型名称") + private String typeName; + + @Column(name = "FNT_LENGTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "长") + private Double fntLength; + + @Column(name = "FNT_WIDTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "宽") + private Double fntWidth; + + @Column(name = "FNT_HEIGHT", columnDefinition = "decimal(18,8)") + @ApiParam(value = "高") + private Double fntHeight; + + @Column(name = "STOREY") + @ApiParam(value = "层") + private Integer storey; + + @Column(name = "FNT_COL") + @ApiParam(value = "列") + private Integer fntCol; + + @Column(name = "IS_SAVE_GOODS") + @ApiParam(value = "是否储物") + private Integer isSaveGoods; + + public Double getFntLengthVal() { + return this.fntLength == null ? 0 : this.fntLength.doubleValue(); + } + public Double getFntWidthVal() { + return this.fntWidth == null ? 0 : this.fntWidth.doubleValue(); + } + public Double getFntHeightVal() { + return this.fntHeight == null ? 0 : this.fntHeight.doubleValue(); + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index d5344c2..2b96da2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -53,6 +53,10 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "存储区代码") private String zoneNo; + @Column(name = "FURNITURE_NO") + @ApiParam(value = "家具代码") + private String furnitureNo; + @Column(name = "X") @ApiParam(value = "X", example = "-1") private Integer x; @@ -65,6 +69,18 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "Z", example = "-1") private Integer z; + @Column(name = "LC_LENGTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "长") + private Double lcLength; + + @Column(name = "LC_WIDTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "宽") + private Double lcWidth; + + @Column(name = "LC_HEIGHT", columnDefinition = "decimal(18,8)") + @ApiParam(value = "高") + private Double lcHeight; + @Column(name = "SEQ") @ApiParam(value = "序号", example = "-1") private Integer seq; @@ -126,6 +142,18 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "末次盘点结束时间") private String lastCsTimeEnd; + @Transient + @ApiParam(value = "库位数组集") + private String[] locateNoArr; + + @Transient + @ApiParam(value = "移动频次") + private Integer frequency; + + @Transient + @ApiParam(value = "库龄") + private String age; + public WmsLocate() { } @@ -134,6 +162,38 @@ public class WmsLocate extends BaseBean { this.destBoxQty = destBoxQty; } + public WmsLocate(Integer boxQty , Double partQty,String locateNo){ + this.boxQty=boxQty; + this.partQty=partQty; + this.locateNo=locateNo; + } + public WmsLocate(String locateNo,Integer frequency,String organizeCode, + String whNo,String zoneNo,String furnitureNo, + Integer x,Integer y,Integer z){ + this.locateNo=locateNo; + this.frequency=frequency; + this.organizeCode=organizeCode; + this.whNo=whNo; + this.zoneNo=zoneNo; + this.furnitureNo=furnitureNo; + this.x=x; + this.y=y; + this.z=z; + } + public WmsLocate(String locateNo,String age,String organizeCode, + String whNo,String zoneNo,String furnitureNo, + Integer x,Integer y,Integer z){ + this.locateNo=locateNo; + this.age=age; + this.organizeCode=organizeCode; + this.whNo=whNo; + this.zoneNo=zoneNo; + this.furnitureNo=furnitureNo; + this.x=x; + this.y=y; + this.z=z; + } + public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); } @@ -153,4 +213,20 @@ public class WmsLocate extends BaseBean { public Integer getLocateType() { return this.locateType== null ? 0 : this.locateType.intValue(); } + + public Double getLcLengthVal() { + return this.lcLength == null ? 0 : this.lcLength.doubleValue(); + } + public Double getLcWidthVal() { + return this.lcWidth == null ? 0 : this.lcWidth.doubleValue(); + } + public Double getLcHeightVal() { + return this.lcHeight == null ? 0 : this.lcHeight.doubleValue(); + } + + public Integer getFrequencyVal() { + return this.frequency == null ? 0 : this.frequency.intValue(); + } + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 3311b77..e9f1cd8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -125,6 +125,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("关联单号") public String refSrc; + @Column(name = "GROUP_NO") + @ApiParam("分组号") + public String groupNo; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; @@ -192,7 +196,7 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "CONSIGNATION") @ApiParam("是否寄售 1-是 2-否") - private Integer consignation; + private Integer consignation = 2; public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index a4405ea..ec13c1e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -159,7 +159,7 @@ public class WmsMoveMaster extends BaseBean { @Transient @ApiParam("总行数") - private Integer itemQty; + private Long itemQty; // @Version // @Column(name = "LOCK_VERSION") @@ -225,10 +225,10 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } - public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){ + public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ this.itemQty = itemQty; this.transTypeCode = transTypeCode; - this.itemStatus = itemStatus; + this.orderStatus = orderStatus; } public Double getTransQty() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java index e474fc7..189a4f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -44,4 +44,24 @@ public class WmsPackage extends BaseBean { @Column(name="PACKAGE_QTY") @ApiParam(value = "包装件数", example = "1") public Integer packageQty; + + @Column(name="PACK_SPEC") + @ApiParam(value = "包装规格") + public String packSpec; + + @Column(name="POCKET_NO") + @ApiParam(value = "容器编号") + public String pocketNo; + + @Column(name="PRINT_STATUS") + @ApiParam(value = "打印状态", example = "1") + public Integer printStatus; + + @Column(name="PACK_LEVEL") + @ApiParam(value = "包装层级", example = "1") + public Integer packLevel; + + @Column(name="MEMO") + @ApiParam(value = "备注") + public String memo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 748e194..c0a9d25 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -35,217 +35,223 @@ public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "PART_SPEC") @ApiParam(value = "物料规格") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partSpec; @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @Column(name = "PART_TYPE_DESC") @ApiParam(value = "物料类型描述") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partTypeDesc; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String color; @Column(name = "STOCK_UNIT") @ApiParam(value = "库存单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockUnit; @Column(name = "ABC") @ApiParam(value = "分类") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标包", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double snp; @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String lotCheckRule; @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") private Integer snControl; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorNo; @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @Transient @ApiParam("总数量") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; @Column(name="verb_num") @ApiParam(value = "单次拆包数") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double verbNum; @Column(name = "IS_PROD_LOT") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS") @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double cycleRquestQty = 0d; + @Column(name = "CURING_TIME") + @ApiParam(value = "固化时间", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double curingTime = 0d; + public int getIqcVal(){ return this.iqc == null ? 0 : this.iqc.intValue(); } @@ -273,6 +279,10 @@ public class WmsPart extends BaseBean { return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue(); } + public Double getCuringTime() { + return this.curingTime == null? 0d:this.curingTime.doubleValue(); + } + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) { this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java new file mode 100644 index 0000000..9641130 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.wms.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 : 物料组信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PART_GROUP") +@Api("物料组信息") +public class WmsPartGroup extends BaseBean{ + + private static final long serialVersionUID = 9214639813072864436L; + @Column(name="PART_GROUP_NO") + @ApiParam("物料组编号") + private String partGroupNo; + + @Column(name="PART_GROUP_NAME") + @ApiParam("物料组名称") + private String partGroupName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java new file mode 100644 index 0000000..d2e7f87 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.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 : 物料组明细信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PART_GROUP_DETAILS") +@Api("物料组明细信息") +public class WmsPartGroupDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072864444L; + @Column(name="PART_GROUP_NO") + @ApiParam("物料组编号") + private String partGroupNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java new file mode 100644 index 0000000..80cc3af --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.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 : 物料组物流路线信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PART_GROUP_ROUTE") +@Api("物料组物流路线信息") +public class WmsPartGroupRoute extends BaseBean{ + + private static final long serialVersionUID = 9214639813072864438L; + @Column(name="PART_GROUP_NO") + @ApiParam("物料组编号") + private String partGroupNo; + + @Column(name = "ROUTING_CODE") + @ApiParam(value = "线路代码") + private String routingCode; + + @Column(name = "ROUTING_NAME") + @ApiParam(value = "线路名称") + private String routingName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 06afc0f..6c78826 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -146,6 +146,10 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "特殊批次") private String fixLotNo = ""; + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; + public WmsPoSn(){} public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index 374abd7..ef75213 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -33,7 +34,7 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "PUSH_NAME") private String pushName; - @ApiParam("规则类型") + @ApiParam("规则表达式") @Column(name = "QUARTZ_CRON") private String quartzCron; @@ -49,10 +50,12 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SERIAL_NUMBER") private Integer serialNumber; + @Lob @ApiParam("查询Hql") @Column(name = "HQL_STR") private String hqlStr; + @Lob @ApiParam("查询Sql") @Column(name = "SQL_STR") private String sqlStr; @@ -61,10 +64,12 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_NO") private String scriptNo; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE") private String titleTemplate; + @Lob @ApiParam("消息体模板") @Column(name = "CONTENT_TEMPLATE") private String contentTemplate; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java index 6a57625..e10dca9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -29,24 +30,23 @@ import javax.persistence.Table; public class WmsPushLog extends BaseBean{ private static final long serialVersionUID = -1708833666516164845L; - @Column(name = "EXE_HQL") - @ApiParam("执行Hql") - private String exeHql; @Column(name = "PUSH_TITLE") @ApiParam("推送标题") private String pushTitle; + @Lob @Column(name = "PUSH_CONTENT") @ApiParam("推送内容") private String pushContent; @Column(name = "PUSH_TYPE") @ApiParam("推送类型") - private String pushType; + private Integer pushType; + + @Column(name = "PATH_URL") + @ApiParam("推送地址") + private String pathUrl; - @Column(name = "PUSH_RESULT") - @ApiParam("推送结果") - private String pushResult; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index bb300a5..b2119ad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -96,6 +96,7 @@ public class WmsRoutingRule extends BaseBean { @Column(name = "MODE_CODE") @ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作，40:自动操作 无交易)" , example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ROUTING_RULE_MODE.class, refForeignKey = "value", value = "description") private Integer modeCode; @Column(name = "DELAY_TIME") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 0e5b1f3..8a53a3d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -286,6 +286,18 @@ public class WmsStockSn extends BaseBean { @ApiParam("打印模板名称") private String templateName; + @Transient + @ApiParam("是否同批次条码") + private Integer isSameBatch; + + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; + + @Transient + @ApiParam(value = "预计完成时间") + private String planCompleteTime; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index ea889c4..ef16765 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -132,13 +132,9 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - public Integer busiType; - - @Column(name = "BUSI_TYPE_DESC") - @ApiParam("业务类型描述") - public String busiTypeDesc; + @Column(name = "BUSI_TYPE_CODE") + @ApiParam("业务类型代码") + public String busiTypeCode; @Column(name = "TRANS_TYPE_CODE_RDD") @ApiParam("交易类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index af7f9f5..fb53699 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -23,11 +23,11 @@ import java.util.List; **/ @Data @Entity -@Table(name="WMS_ZONES") +@Table(name = "WMS_ZONES") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="存储区信息表",description = "存储区信息表") +@Api(value = "存储区信息表", description = "存储区信息表") public class WmsZones extends BaseBean { private static final long serialVersionUID = 7759454799191378612L; @@ -48,7 +48,7 @@ public class WmsZones extends BaseBean { private String zoneName; @Column(name = "PARENT_ZONE_NO") - @ApiParam(value = "父级存储区", example ="-1") + @ApiParam(value = "父级存储区", example = "-1") private String parentZoneNo; @Column(name = "IS_SON_NODE") @@ -56,23 +56,23 @@ public class WmsZones extends BaseBean { private Integer isSonNode; @Column(name = "IS_PM") - @ApiParam(value = "零件级管控" , example = "2") + @ApiParam(value = "零件级管控", example = "2") private Integer isPm; @Column(name = "IS_LM") - @ApiParam(value = "批次级管控" , example = "2") + @ApiParam(value = "批次级管控", example = "2") private Integer isLm; @Column(name = "IS_SN") - @ApiParam(value = "条码级管控" , example = "1") + @ApiParam(value = "条码级管控", example = "1") private Integer isSn; @Column(name = "IS_MIX") - @ApiParam(value = "允许混淆" , example = "1") + @ApiParam(value = "允许混淆", example = "1") private Integer isMix; @Column(name = "IS_SC") - @ApiParam(value = "库容检查" , example = "1") + @ApiParam(value = "库容检查", example = "1") private Integer isSc; @Column(name = "STRATEGY") @@ -80,26 +80,41 @@ public class WmsZones extends BaseBean { private String strategy; @Column(name = "IS_NEGATIVE") - @ApiParam(value = "允许负库存" , example = "1") + @ApiParam(value = "允许负库存", example = "1") private Integer isNegative; @Column(name = "CHECK_FIFO") - @ApiParam(value = "校验先进先出" , example = "1") + @ApiParam(value = "校验先进先出", example = "1") private Integer checkFifo; + @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "长") + private Double zoneLength; + + @Column(name = "ZONE_WIDTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "宽") + private Double zoneWidth; + @Transient - @ApiParam(value ="子存储区列表") + @ApiParam(value = "子存储区列表") private List childList; - public WmsZones(String zoneNo){ + public WmsZones(String zoneNo) { this.zoneNo = zoneNo; } - public WmsZones(String zoneNo,String areaNo){ + public WmsZones(String zoneNo, String areaNo) { this.zoneNo = zoneNo; this.areaNo = areaNo; } - public WmsZones(){} + public WmsZones() { + } + public double getZoneLengthVal() { + return this.zoneLength == null ? 0 : this.zoneLength.doubleValue(); + } + public double getZoneWidthVal() { + return this.zoneWidth == null ? 0 : this.zoneWidth.doubleValue(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java similarity index 94% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index b1f3e68..924d245 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean.dynamic; +package cn.estsh.i3plus.pojo.wms.bean.dynamictable; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -45,6 +45,10 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "字段类型") private String fieldType; + @Column(name = "ENUM_NAME") + @ApiParam(value = "字段枚举名称") + private String enumName; + @Column(name = "ENTITY_NAME") @ApiParam(value = "实体名称") private String entityName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java similarity index 93% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java index d654c64..41f6b6f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean.dynamic; +package cn.estsh.i3plus.pojo.wms.bean.dynamictable; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -77,4 +77,8 @@ public class WmsListElement extends BaseBean { @Column(name = "USER_CODE") @ApiParam(value = "用户编号") private String userCode; + + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java similarity index 96% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java index dc94f0a..9a6f4b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElementFunction.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean.dynamic; +package cn.estsh.i3plus.pojo.wms.bean.dynamictable; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java similarity index 74% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java index 8ffe833..99b223f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean.dynamic; +package cn.estsh.i3plus.pojo.wms.bean.dynamictable; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : WMS搜索元素表 @@ -24,6 +21,7 @@ import javax.persistence.Table; @Entity @Table(name="WMS_SEARCHELEMENT", indexes = { @Index(columnList = "FIELD_NAME"), + @Index(columnList = "FIELD_TYPE"), @Index(columnList = "SEARCH_NAME"), @Index(columnList = "USER_CODE") }) @@ -43,6 +41,10 @@ public class WmsSearchElement extends BaseBean { @ApiParam(value = "标题名称") private String titleName; + @Column(name = "FIELD_TYPE") + @ApiParam(value = "字段类型") + private String fieldType; + @Column(name = "CONDITION_EXPRE") @ApiParam(value = "条件表达式:>,<,>=等") private String conditionExpre; @@ -62,4 +64,24 @@ public class WmsSearchElement extends BaseBean { @Column(name = "USER_CODE") @ApiParam(value = "用户编号") private String userCode; + + /** + * 搜索组名称 + */ + private String groupName; + + /** + * 搜索组连接符 + */ + private String groupConnector; + + /** + * 开始时间字符串 + */ + private String startDateTimeStr; + + /** + * 结束时间字符串 + */ + private String endDateTimeStr; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java similarity index 85% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java index 43cbb23..b400277 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElementFunction.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean.dynamic; +package cn.estsh.i3plus.pojo.wms.bean.dynamictable; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -25,8 +25,8 @@ import javax.persistence.Table; @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { @Index(columnList = "FUNCTION_ID"), @Index(columnList = "SEARCH_ELEMENT_ID"), - @Index(columnList = "IS_SHARE"), - @Index(columnList = "USER_CODE") + @Index(columnList = "USER_CODE"), + @Index(columnList = "SEARCH_NAME") }) @DynamicInsert @DynamicUpdate @@ -56,7 +56,14 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "用户编号") private String userCode; + /** + * 1-共享，2-不共享 + */ @Column(name = "IS_SHARE") @ApiParam(value = "是否共享") private Integer isShare; + + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java index 6667a49..28fbe82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -1,15 +1,16 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; import java.util.Map; @Data public class MailMessageModel extends PushMessageModel { - - //附加，value 文件的绝对地址/动态模板数据 - private Map attachment; - + //推送数据 + @ApiParam("推送数据集合") + List dataList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java index 1e2ff26..8c7abb5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; @@ -9,17 +11,23 @@ import java.util.Map; public class PushMessageModel { - //标题 + @ApiParam("标题") public String title; - //内容 + + @ApiParam("内容") public String content; - //推送类型 + //推送类型-枚举 ：WmsEnumUtil.PUSH_TYPE + @ApiParam("推送类型") public String pushType; - //推送地址 + //推送地址，邮箱以逗号分割 + @ApiParam("推送地址") public String pathUrl; - //推送数据 - List> dataList; + + @ApiParam("工厂代码") + private String organizeCode; + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java new file mode 100644 index 0000000..f6c8ef8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QadBop; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +public interface QadBopRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java new file mode 100644 index 0000000..21c95ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QadItemPacking; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +public interface QadItemPackingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java index da71990..97dad56 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; +import org.springframework.stereotype.Repository; /** * @Description : 系统配置 @@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; * @CreateDate : 2019-03-07 10:00 * @Modify: **/ +@Repository public interface WmsConfigRepository extends BaseRepository { /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCsStrategyRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCsStrategyRepository.java new file mode 100644 index 0000000..19a07e7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCsStrategyRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCsStrategy; + +/** +* @Description : 盘点策略表 +* @Reference : +* @Author :QianHuaSheng +* @CreateDate : 2018-11-17 15:53 +* @Modify: +**/ +public interface WmsCsStrategyRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java index f1e59d0..1d17d42 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import org.springframework.stereotype.Repository; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFurnitureRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFurnitureRepository.java new file mode 100644 index 0000000..21b0367 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFurnitureRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsFurniture; +import org.springframework.stereotype.Repository; + +/** + * @Description 家具对象DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/2/20 10:56 + * @Modify + */ +@Repository +public interface WmsFurnitureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFurnitureTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFurnitureTypeRepository.java new file mode 100644 index 0000000..bfda65a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFurnitureTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsFurnitureType; +import org.springframework.stereotype.Repository; + +/** + * @Description 家具类型对象DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/2/20 10:56 + * @Modify + */ +@Repository +public interface WmsFurnitureTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java index 5b724e6..620561a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsListElementFunction; import org.springframework.stereotype.Repository; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java index 9433e7d..256a73f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsListElement; import org.springframework.stereotype.Repository; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java new file mode 100644 index 0000000..253c463 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description :物料组明细信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 15:17 + * @Modify: + **/ +@Repository +public interface WmsPartGroupDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java new file mode 100644 index 0000000..ddd376a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description :物料组信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 15:17 + * @Modify: + **/ +@Repository +public interface WmsPartGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java new file mode 100644 index 0000000..c7e779f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupRoute; +import org.springframework.stereotype.Repository; + +/** + * @Description :物料组物流路线信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 15:17 + * @Modify: + **/ +@Repository +public interface WmsPartGroupRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java index 1746d7e..a40624d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; import org.springframework.stereotype.Repository; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java index 028586d..37e4a5f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElement; import org.springframework.stereotype.Repository; /** 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 65c25de..6b4788b 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 @@ -7,7 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; -import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; +import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; @@ -169,11 +170,34 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); getStringBuilderPack(swebProcurementPlanOrder, packBean); return packBean; } /** + * 物理包装封装 + * + * @param wmsPackage + * @return + */ + public static DdlPackBean packWmsPackage(WmsPackage wmsPackage) { + DdlPackBean packBean = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(wmsPackage.getPrintStatus(), "printStatus", packBean); + DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo()==null?"":wmsPackage.getPackageNo()+"%", "packageNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean); + DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo()==null?"":wmsPackage.getPocketNo()+"%", "pocketNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsPackage.getPackLevel(), "packLevel", packBean); + DdlPreparedPack.getNumEqualPack(wmsPackage.getIsValid()==null?CommonEnumUtil.IS_VAILD.VAILD.getValue():wmsPackage.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + getStringBuilderPack(wmsPackage, packBean); + return packBean; + } + + /** * 库存移动单查询封装 * * @param wmsDocMovementMaster @@ -229,7 +253,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result); if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { ArrayList numList = new ArrayList<>(); numList.add(0); @@ -519,6 +543,9 @@ public class WmsHqlPack { if (wmsLocate.getZoneNo() != null) { DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result); } + if (wmsLocate.getLocateNoArr() != null) { + DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result); + } // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); @@ -633,6 +660,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getContainerNo(), "containerNo", result); // 查询计划时间在指定范围的单号，查询这些单号的数据 if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) { @@ -1062,7 +1090,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result); DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); - DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); +// DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); getStringBuilderPack(wmsPackage, result); @@ -1270,6 +1298,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); if (wmsStockSn.getIsValid() != null) { @@ -1363,6 +1392,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); getStringBuilderPack(wmsCSOrderDetails, result); @@ -1587,6 +1618,27 @@ public class WmsHqlPack { return result; } + public static DdlPackBean packNewWmsStockSn(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + + DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); + DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); + result.setOrderByStr(wmsStockSn.orderBy()); + + getStringBuilderPack(wmsStockSn, result); + return result; + } /** * 根据条件查询条码条码信息 * @@ -1880,6 +1932,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); @@ -2432,6 +2485,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result); + DdlPreparedPack.getNumEqualPack(wmsRouting.getForProduct(), "forProduct", result); + DdlPreparedPack.getNumEqualPack(wmsRouting.getForWareHouse(), "forWareHouse", result); + DdlPreparedPack.getNumEqualPack(wmsRouting.getForProductClass(), "forProductClass", result); // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRouting, result); @@ -2727,4 +2783,69 @@ public class WmsHqlPack { getStringBuilderPack(wmsFieldInfo, result); return result; } + + /** + * WMS搜索记录查询条件 + * + * @param searchElementFunction + * @return + */ + public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result); + DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result); + DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result); + getStringBuilderPack(searchElementFunction, result); + return result; + } + + /** + * 物料组信息分页查询条件 + * + * @param wmsPartGroup + * @return + */ + public static DdlPackBean packHqlWmsPartGroup(WmsPartGroup wmsPartGroup) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupNo(), "partGroupNo", result); + DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupName(), "partGroupName", result); + + getStringBuilderPack(wmsPartGroup, result); + + return result; + } + + /** + * 物料组物流路线信息分页查询条件 + * + * @param wmsPartGroupRoute + * @return + */ + public static DdlPackBean packHqlWmsPartGroupRoute(WmsPartGroupRoute wmsPartGroupRoute) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsPartGroupRoute.getPartGroupNo(), "partGroupNo", result); + + getStringBuilderPack(wmsPartGroupRoute, result); + + return result; + } + + /** + * 物料组物流路线信息分页查询条件 + * + * @param wmsPartGroupDetails + * @return + */ + public static DdlPackBean packHqlWmsPartGroupDetails(WmsPartGroupDetails wmsPartGroupDetails) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsPartGroupDetails.getPartGroupNo(), "partGroupNo", result); + + getStringBuilderPack(wmsPartGroupDetails, result); + + return result; + } + } diff --git a/pom.xml b/pom.xml index 615ca1f..b2d5808 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,9 @@ modules/i3plus-pojo-mes-pcn modules/i3plus-pojo-sweb modules/i3plus-pojo-andon + modules/i3plus-pojo-aps modules/i3plus-pojo-lac + modules/i3plus-pojo-ptl