From b7caa5836bf0b4c0a85f2702a88b18c4bf480a7e Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Fri, 26 Feb 2021 15:53:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: andly.pan --- .../cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 80 ++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 33 +++++++ .../i3plus/pojo/aps/holders/EImportField.java | 5 + .../i3plus/pojo/aps/model/ExportModelRequest.java | 21 +++++ .../pojo/aps/repository/ImportFieldRepository.java | 9 ++ .../aps/repository/SafeStockOrderRepository.java | 9 ++ .../src/main/resources/relations/ImportDetail.xml | 5 + .../i3plus/pojo/mes/bean/IfDeliverOrderData.java | 70 ++++++++++++++ .../i3plus/pojo/mes/bean/MesAnalysisRule.java | 44 +++++++++ .../estsh/i3plus/pojo/mes/bean/MesBpBusiness.java | 43 +++++++++ .../i3plus/pojo/mes/bean/MesDataMigrationCfg.java | 103 +++++++++++++++++++++ .../pojo/mes/bean/MesEquTaskDetailStandard.java | 50 ++++++++++ .../pojo/mes/bean/MesEquTaskPlanStandard.java | 50 ++++++++++ .../i3plus/pojo/mes/bean/MesPackageQueue.java | 76 +++++++++++++++ .../i3plus/pojo/mes/bean/MesPartAnalysisRule.java | 40 ++++++++ .../i3plus/pojo/mes/bean/MesStateMachineStep.java | 80 ++++++++++++++++ .../pojo/mes/model/BusiQueueDispatchModel.java | 36 +++++++ .../estsh/i3plus/pojo/mes/model/IfReportModel.java | 32 +++++++ .../i3plus/pojo/mes/model/LogisticsBiModel.java | 36 +++++++ .../i3plus/pojo/mes/model/RouteProcessModel.java | 43 +++++++++ .../mes/model/StateMachineRouteDesignModel.java | 47 ++++++++++ .../pojo/mes/model/StateMachineStatusModel.java | 31 +++++++ .../pojo/mes/model/StateMachineStepModel.java | 23 +++++ .../pojo/mes/model/StateMachineStepParamModel.java | 27 ++++++ .../i3plus/pojo/mes/model/TestStateModel.java | 20 ++++ .../mes/model/mgn/tj/AssemblyRealWorkModel.java | 30 ++++++ .../pojo/mes/model/report/ConditionQueryModel.java | 38 ++++++++ .../model/report/CosmaReportProductSnModel.java | 25 +++++ .../pojo/mes/model/report/ProdCustPartModel.java | 31 +++++++ .../model/report/ProduceDefectRatePlatoModel.java | 57 ++++++++++++ .../mes/model/report/ProductSnConditionModel.java | 62 +++++++++++++ .../repository/IfDeliverOrderDataRepository.java | 9 ++ .../mes/repository/MesAnalysisRuleRepository.java | 15 +++ .../mes/repository/MesBpBusinessRepository.java | 9 ++ .../repository/MesDataMigrationCfgRepository.java | 9 ++ .../MesEquTaskDetailStandardRepository.java | 13 +++ .../MesEquTaskPlanStandardRepository.java | 13 +++ .../mes/repository/MesPackageQueueRepository.java | 15 +++ .../repository/MesPartAnalysisRuleRepository.java | 15 +++ .../repository/MesStateMachineStepRepository.java | 15 +++ .../i3plus/pojo/model/platform/RoleRealmModel.java | 25 +++++ .../pojo/model/platform/SystemLoginModel.java | 40 ++++++++ .../pojo/wms/modelbean/JisReportDetailModel.java | 29 ++++++ .../i3plus/pojo/wms/modelbean/JisReportModel.java | 46 +++++++++ 44 files changed, 1509 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java new file mode 100644 index 0000000..24134ab --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; +import cn.estsh.i3plus.pojo.aps.holders.EImportField; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :数据导入明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_IMPORT_FIELD") +@Api("数据导入字段配置") +public class ImportField extends BaseAPS { + + private static final long serialVersionUID = 8848879008582197564L; + @Column(name="FIELD_NAME") + @ApiParam("字段名") + private String fieldName; + + @Column(name="LABEL_NAME") + @ApiParam("标签名称") + private String labelName; + + @Column(name="DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + /** + * 1-是，2-否 + */ + @Column(name="IS_REQUIRE") + @ApiParam(value = "是否必填", example = "0") + private Integer isRequire; + + @Column(name="MAX_LENGTH") + @ApiParam(value = "最大长度", example = "0") + private Integer maxLength; + + @Column(name="RELATION_TABLE") + @ApiParam("关联表名") + private String relationTable; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + @Transient + private transient boolean hasDeal = false; + + @Column(name="IMPORT_DETAIL_ID") + @ApiParam(value ="导入明细ID") + @FieldAnnotation(relation = "ImportDetail", notEmpty = true) + private Long importDetailId; + + public ImportDetail getImportDetail() { + return BeanRelation.get(this, EImportField.ImportDetail); + } + + public void setImportDetail(ImportDetail detail) { + this.importDetailId = detail != null ? detail.getId() : 0l; + BeanRelation.set(this, EImportField.ImportDetail, detail); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java new file mode 100644 index 0000000..53a7d66 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :安全库存订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-02-23 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_SAFE_STOCK_ORDER") +@Api("安全库存订单") +public class SafeStockOrder extends BaseOrder { + + private static final long serialVersionUID = 5944067344390531794L; + + @JsonIgnore + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java new file mode 100644 index 0000000..eeff1ef --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EImportField { + ImportDetail +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java new file mode 100644 index 0000000..9774f5e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 表格导出查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-02-25 + * @Modify: + **/ +@Data +@Api("表格导出查询参数") +public class ExportModelRequest { + private String filter; + private List sorts; + private String tableName; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java new file mode 100644 index 0000000..395975c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ImportField; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ImportFieldRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java new file mode 100644 index 0000000..ff0c5ee --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.SafeStockOrder; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface SafeStockOrderRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml new file mode 100644 index 0000000..56372fd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java new file mode 100644 index 0000000..7b8c9ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java @@ -0,0 +1,70 @@ +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.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_订单交付数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_DELIVER_ORDER_DATA") +@Api("IF_订单交付数据") +public class IfDeliverOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695347L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("发运数量") + private Integer qty = 0; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private Integer moveType; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java new file mode 100644 index 0000000..4384878 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java @@ -0,0 +1,44 @@ +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: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ANALYSIS_RULE") +@Api("MES_解析规则") +public class MesAnalysisRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; + + @Column(name = "ANALYSIS_RULE_CODE") + @ApiParam("解析规则") + private String analysisRuleCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java new file mode 100644 index 0000000..5a1bed1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java @@ -0,0 +1,43 @@ +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.*; +import java.io.Serializable; + +/** + * @Description :BP业务对比表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BP_BUSINESS") +@Api("BP业务对比表") +public class MesBpBusiness extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053666347L; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("预测数量") + private Double qty = 0d; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java new file mode 100644 index 0000000..14a5354 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java @@ -0,0 +1,103 @@ +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.*; +import java.io.Serializable; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_DATA_MIGRATION_CFG") +@Api("MES数据迁移配置表") +public class MesDataMigrationCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6445732389643648643L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN节点名称代码") + private String pcnCode; + + @Column(name = "MIG_NAME") + @ApiParam("名称") + private String migName; + + @Column(name = "REMARK") + @ApiParam("描述") + private String remark; + +// @Column(name = "MIGRATION_CYCLE") +// @ApiParam("迁移周期") +// private String migrationCycle; +// +// @Column(name = "NEXT_EXECUTION_TIME") +// @ApiParam("下次执行时间") +// private String nextExecutionTime; + + @Column(name = "SRC_TABLE_NAME") + @ApiParam("来源表名") + private String srcTableName; + + @Column(name = "SRC_QUERY_CONDITIONS") + @ApiParam("来源表查询条件") + private String srcQueryConditions; + + @Column(name = "PROCESS_QTY") + @ApiParam(value = "每次处理行数", example = "0") + private Integer processQty; + + @Column(name = "DEST_TABLE_NAME") + @ApiParam("目标表名") + private String destTableName; + + @Column(name = "IS_PHYSICAL_DELETE") + @ApiParam(value = "是否物理删除", example = "0") + private Integer isPhysicalDelete; + + @Column(name = "LAST_EXECUTION_TIME") + @ApiParam("末次迁移时间") + private String lastExecutionTime; + + @Column(name = "LAST_MIGRATION_QTY") + @ApiParam(value = "末次迁移记录数", example = "0") + private Integer lastMigrationQty; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("执行错误日志") + private String errorMessage; + + + @Transient + @ApiParam(value = "开始时间") + private String mcStartTime; + + @Transient + @ApiParam(value = "结束时间") + private String mcEndTime; + + /*public MesDataMigrationCfg(String migName, String remark, String migrationCycle, String nextExecutionTime, String srcTableName, String srcQueryConditions, Integer processQty, String destTableName, Integer isPhysicalDelete, String lastExecutionTime, Integer lastMigrationQty, String errorMessage, String mcStartTime, String mcEndTime) { + this.migName = migName; + this.remark = remark; + this.migrationCycle = migrationCycle; + this.nextExecutionTime = nextExecutionTime; + this.srcTableName = srcTableName; + this.srcQueryConditions = srcQueryConditions; + this.processQty = processQty; + this.destTableName = destTableName; + this.isPhysicalDelete = isPhysicalDelete; + this.lastExecutionTime = lastExecutionTime; + this.lastMigrationQty = lastMigrationQty; + this.errorMessage = errorMessage; + this.mcStartTime = mcStartTime; + this.mcEndTime = mcEndTime; + }*/ +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java new file mode 100644 index 0000000..97c9310 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java @@ -0,0 +1,50 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:47 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_DETAIL_STANDARD") +@Api("设备作业任务要求") +public class MesEquTaskDetailStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8033976649492744091L; + + @Column(name = "TASK_DETAIL_ID") + @ApiParam("任务明细ID") + private Long taskDetailId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java new file mode 100644 index 0000000..71b4157 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java @@ -0,0 +1,50 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: 设备周期计划作业要求 + * @Author: jokelin + * @Date: 2021/1/25 10:43 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_PLAN_STANDARD") +@Api("设备周期计划作业要求") +public class MesEquTaskPlanStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8284644034068953809L; + + @Column(name = "PLAN_ID") + @ApiParam("计划ID") + private Long planId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java new file mode 100644 index 0000000..d3dab83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java @@ -0,0 +1,76 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/10 5:39 PM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_QUEUE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "CT_NO") +}) +@Api("MES_包装队列") +public class MesPackageQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7427832962272134299L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameAdd; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ApiParam("数量") + private Double qty; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java new file mode 100644 index 0000000..83be007 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java @@ -0,0 +1,40 @@ +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: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_ANALYSIS_RULE") +@Api("MES_物料解析规则配置") +public class MesPartAnalysisRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7877300316848838443L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java new file mode 100644 index 0000000..613a5bd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java @@ -0,0 +1,80 @@ +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 : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE_STEP") +@Api("状态机工步参数配置表") +public class MesStateMachineStep extends BaseBean implements Serializable { + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "AMG_ID") + @ApiParam("工步集代码") + private Long amgId; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name = "PARAM_CODE") + @ApiParam("工步参数代码") + private String paramCode; + + @Column(name = "PARAM_TYPE") + @ApiParam("工步参数类型") + private Integer paramType; + + @Column(name = "PARAM_VALUE") + @ApiParam("工步参数值") + private String paramValue; + + @Column(name = "PARAM_ATTRIBUTE") + @ApiParam("参数属性") + private String paramAttribute; + + + public int getStepSeq() { + return this.stepSeq == null ? 0 : this.stepSeq; + } + + public void setStepSeq(int stepSeq) { + this.stepSeq = stepSeq; + } + + public int getParamTypeVal() { + return this.paramType == null ? 0 : this.paramType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java new file mode 100644 index 0000000..2883a02 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 业务队列model + * @Reference: + * @Author: wangjie + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class BusiQueueDispatchModel { + + @ApiParam("实现类") + private Object busDispatchervice; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("key") + private String key; + + @ApiParam("数据") + private Object Obj; + + @ApiParam("信息") + private String info; + + @ApiParam("集合") + private List list; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java new file mode 100644 index 0000000..b2cc171 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/2/19 2:58 PM + * @Modify: + */ +@Data +public class IfReportModel { + + @ApiParam("接口表代码") + private String ifTableCode; + + @ApiParam("接口表名称") + private String ifTableName; + + @ApiParam("总数") + private Integer total; + + @ApiParam("已同步数量") + private Integer alreadySync; + + @ApiParam("未同步数量") + private Integer noSync; + + @ApiParam("修改时间") + private String modifyDatetime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java new file mode 100644 index 0000000..b3105ce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/28 2:37 下午 + * @Modify: + */ +@Data +public class LogisticsBiModel implements Serializable { + + @ApiParam(value = "去年每月发运数量") + private double lastQty = 0; + + @ApiParam(value = "今年每月发运数量") + private double thisQty = 0; + + @ApiParam(value = "比例值") + private double annualRatio = 0; + + @ApiParam(value = "月份") + private Integer month; + + @ApiParam(value = "实际出库数量") + private double outQty = 0; + + @ApiParam(value = "BP总数") + private double bpQty= 0; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java new file mode 100644 index 0000000..b0e5ec7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPartProduceType; +import cn.estsh.i3plus.pojo.mes.bean.MesProcess; +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 流程工序Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("流程工序Model") +public class RouteProcessModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("产线代码") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("流程类型") + private Integer routeType; + + @ApiParam("流程集合") + private List routeList; + + @ApiParam("工序集合") + private List processList; + + @ApiParam("生产类型集合") + private List pptList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java new file mode 100644 index 0000000..25a2d08 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachine; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态机流程工序设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工序设计Model") +public class StateMachineRouteDesignModel { + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("用户") + private String userInfo; + + @ApiParam("流程") + private MesRoute route; + + @ApiParam("流程工序(根据Seq分组)") + private Map routeProcessMap; + + @ApiParam("状态机") + private MesStateMachine stateMachine; + + @ApiParam("状态点") + private List stateMachineStatusList; + + @ApiParam("流程工序Id") + private Long routeProcessId; + + @ApiParam("产品流程Id") + private Long prodRouteCfgId; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java new file mode 100644 index 0000000..295df7f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态点设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态点设计Model") +public class StateMachineStatusModel extends MesStateMachineStatus { + + @ApiParam("状态点顺序") + private Integer seq = 0; + + @ApiParam("状态点工步集Map") + private Map> stepGroupMap; + + @ApiParam("下个状态点MAP") + private Map> nextStatusGroupMap; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java new file mode 100644 index 0000000..bf16352 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStep; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 状态机流程工步设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工步设计Model") +public class StateMachineStepModel extends MesStep { + + @ApiParam("工步参数集合") + private List stepParamList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java new file mode 100644 index 0000000..4808522 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStepParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态机流程工步参数设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工步参数设计Model") +public class StateMachineStepParamModel extends MesStepParam { + + @ApiParam("参数值") + private String paramValue; + + @ApiParam("可选值的数据") + private List> enumList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java new file mode 100644 index 0000000..0957f35 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/14 15:18 + * @desc + */ +@Data +public class TestStateModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("时间") + private String createDatetime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java new file mode 100644 index 0000000..ebb9bc8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 总装实际产量model + * @Author: wangjie + * @Date: 2020/10/28 2:56 PM + * @Modify: + */ +@Data +public class AssemblyRealWorkModel { + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("实际产量") + private Double realProdQty; + + @ApiParam("实际目标") + private Double realPlanQty; + + @ApiParam("班产目标") + private Double shiftPlanQty; + + @ApiParam("本班达成率") + private Integer shiftPassPercent; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java new file mode 100644 index 0000000..22f0883 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 产品工序过程查询-条件 + * @author yumingxing + * @version 1.0 + * @date 2021/1/10 11:02 + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("产品工序过程查询-条件") +public class ConditionQueryModel { + + @ApiParam("项目名称") + private String prodCfgTypeCode; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; + + @ApiParam("零件二维码") + private String serialNumber; + + @ApiParam("质量状态") + private Integer qcStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java new file mode 100644 index 0000000..26dfa50 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品条码返回model + * @author xiangming.liao + * @version 1.0 + * @date 2021/01/06 10:43 + **/ +@Data +@ApiModel("产品条码返回model") +public class CosmaReportProductSnModel extends MesProduceSn implements Serializable { + + private static final long serialVersionUID = 5217363746963291483L; + @ApiParam("条码类型Name") + private String snTypeName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java new file mode 100644 index 0000000..beecea1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author yumingxing + * @version 1.0 + * @date 2021/1/9 14:29 + **/ +@ApiModel("项目号零件号") +@Data + +public class ProdCustPartModel { + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户零件号") + private String customerPartNo; + + public ProdCustPartModel(String prodCfgTypeCode, String partNo, String customerPartNo) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.partNo = partNo; + this.customerPartNo = customerPartNo; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java new file mode 100644 index 0000000..0fef7e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/28 14:24 下午 + * @Description: 缺陷率占比柏拉图报表model + **/ +@Api("缺陷率占比柏拉图报表model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ProduceDefectRatePlatoModel { + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("单项占比") + private Double singleRatio; + + @ApiParam("累计占比") + private Double cumulativeRatio; + + @ApiParam("数量") + private Long qty; + + public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, String defectCode, String defectName, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.customerPartNo = customerPartNo; + this.defectCode = defectCode; + this.defectName = defectName; + this.qty = qty; + } + + public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.customerPartNo = customerPartNo; + this.qty = qty; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java new file mode 100644 index 0000000..2f9566d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-产品信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +@ApiModel("产品工序过程查询-条件查询页面") +public class ProductSnConditionModel implements Serializable { + + private static final long serialVersionUID = 3154899794523800804L; + + @ApiParam("零件二维码") + private String serialNumber; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("CMS零件号") + private String partNo; + + @ApiParam("项目名称") + private String prodCfgTypeCode; + + @ApiParam("产线") + private String workCenterName; + + @ApiParam("工序名称") + private String processName; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam(value = "扫码时间") + public String createDatetime; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("质量状态Name") + private String qcStatusName; + + public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterName, String processName, String workCellName, String createDatetime, Integer qcStatus) { + this.serialNumber = serialNumber; + this.customerPartNo = customerPartNo; + this.partNo = partNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.workCenterName = workCenterName; + this.processName = processName; + this.workCellName = workCellName; + this.createDatetime = createDatetime; + this.qcStatus = qcStatus; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java new file mode 100644 index 0000000..69bc18f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfDeliverOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfDeliverOrderDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java new file mode 100644 index 0000000..db27680 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.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.MesAnalysisRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesAnalysisRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java new file mode 100644 index 0000000..743c8fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBpBusiness; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesBpBusinessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java new file mode 100644 index 0000000..caa29bb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDataMigrationCfg; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesDataMigrationCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java new file mode 100644 index 0000000..38c311a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskDetailStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:49 AM + * @Modify: + */ +public interface MesEquTaskDetailStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java new file mode 100644 index 0000000..03b79f7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:46 AM + * @Modify: + */ +public interface MesEquTaskPlanStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java new file mode 100644 index 0000000..14d91be --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.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.MesPackageQueue; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/10 5:40 PM + * @Modify: + */ +@Repository +public interface MesPackageQueueRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java new file mode 100644 index 0000000..062e6b7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.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.MesPartAnalysisRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesPartAnalysisRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java new file mode 100644 index 0000000..9acea36 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.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.MesStateMachineStep; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019\10\9 + * @Modify: + **/ +public interface MesStateMachineStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java new file mode 100644 index 0000000..5aae99e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.shiro.realm.Realm; + +/** + * @author Wynne.Lu + * @date 2021/1/19 下午1:29 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RoleRealmModel { + + private Realm userRealm; + + private Realm saRealm; + + private Realm adminRealm; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java new file mode 100644 index 0000000..32c8d93 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2021/1/18 上午10:56 + * @desc 系统登录模型 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("系统登录模型") +public class SystemLoginModel { + + @ApiParam(value = "登录名") + private String loginName; + + @ApiParam(value = "登录密码") + private String loginPwd; + + @ApiParam(value = "语言代码") + private String languageCode; + + @ApiParam(value = "设备id") + private String deviceId; + + @ApiParam(value = "单点登录策略") + private String loginStrategy; + + @ApiParam(value = "app Id") + private String appId; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java new file mode 100644 index 0000000..3f50ac6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +@Api("JIS发运报表明细模型") +public class JisReportDetailModel extends BaseBean { + @ApiParam("客户工厂") + private String customerNo; + @ApiParam("计划发货数量") + private Integer planShipingCount; + @ApiParam("计划发货时间") + private String planLoadTime; + @ApiParam("料架号") + private String fixLotNo; + @ApiParam("排序单号") + private String queneGroupNo; + @ApiParam("JIS号") + private String jisNo; + @ApiParam("箱条码") + private String sn; + @ApiParam("实际发货时间") + private String actualLoadTime; + @ApiParam("实际上线时间") + private String custOnLineTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java new file mode 100644 index 0000000..827a1a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +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; + +@Data +@Api("JIS发运报表模型") +public class JisReportModel extends BaseBean { + + @ApiParam("客户工厂") + private String custOrganizeCode; + @ApiParam("计划装车时间") + private String planLoadTime; + @ApiParam("计划发货数量") + private Double planShipingCount; + @ApiParam("实际装车时间") + private String actualLoadTime; + @ApiParam("实际发货数量") + private Double actualShipingCount; + @ApiParam("状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.TIME_STATUS.class,refForeignKey = "value",value = "description") + private Integer shippingStatus; + @ApiParam("料架号1") + private String queueGroupNo_1; + @ApiParam("客户上线时间1") + private String custOnLineTime_1; + @ApiParam("料架号2") + private String queueGroupNo_2; + @ApiParam("客户上线时间2") + private String custOnLineTime_2; + @ApiParam("料架号3") + private String queueGroupNo_3; + @ApiParam("客户上线时间3") + private String custOnLineTime_3; + @ApiParam("料架号4") + private String queueGroupNo_4; + @ApiParam("客户上线时间4") + private String custOnLineTime_4; + @ApiParam("客户现场库存") + private Double qty; + +}