From fcefe8de38b2b438ee6dbff92c3d62bbd65b038d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Tue, 15 Oct 2019 21:21:34 +0800 Subject: [PATCH 01/82] =?UTF-8?q?1.=20=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E7=94=A8=E8=BD=AF=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=88=E4=BD=BF=E7=94=A8=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=BC=95=E6=93=8E=E5=AE=9E=E7=8E=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/dbinterface/WmsInterfaceDataMapper.java | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index ff1eadc..0abcde9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -116,4 +116,39 @@ public class WmsInterfaceDataMapper extends BaseBean { @Column(name = "LAST_SYNC_TIME") public String lastSyncTime; + /** + * 软适配编号 + */ + @Column(name = "SOFT_ADAPATOR_CODE") + public String softAdaptorCode; + + /** + * 扩展脚本编号，用于扩展接口功能 + */ + @Column(name = "SCRIPT_NO") + public String ScriptNo; + + /** + * 调用脚本方法获取数据 + */ + @Column(name = "USE_SCRIPT_PULL") + public int useScriptPull; + + /** + * 调用脚本方法保存数据 + */ + @Column(name = "USE_SCRIPT_PUSH") + public int useScriptPush; + + /** + * 调用脚本方法更新同步标志 + */ + @Column(name = "USE_SCRIPT_MARK") + public int useScriptMark; + + /** + * 调用脚本方法过滤数据（查询来源数据后过滤） + */ + @Column(name = "USE_SCRIPT_FILTER") + public int useScriptFilter; } From da97adcbc7129e035d3821d48f7ec2613d5cca69 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 16 Oct 2019 13:37:15 +0800 Subject: [PATCH 02/82] =?UTF-8?q?=E6=9B=B4=E6=94=B9db=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 0 .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java | 62 ---------------------- ...epository.java => MesDatasourceRepository.java} | 4 +- 3 files changed, 2 insertions(+), 64 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/{MesDbRepository.java => MesDatasourceRepository.java} (57%) 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 new file mode 100644 index 0000000..e69de29 diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java deleted file mode 100644 index 113151d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:17 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DB") -@Api("地址清单") -public class MesDb extends BaseBean { - - @Column(name="DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name="DS_NAME") - @ApiParam("数据源名称") - private String dsName; - - @Column(name="DS_TYPE") - @ApiParam("数据源类型") - private String dsType; - - @Column(name="DS_HOST") - @ApiParam("主机") - private String dsHost; - - @Column(name="DS_PORT") - @ApiParam("端口") - private Integer dsPort; - - @Column(name="DS_USER") - @ApiParam("用户名") - private String dsUser; - - @Column(name="DS_PASSWORD") - @ApiParam("密码") - private String dsPassword; - - @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/repository/MesDbRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java similarity index 57% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java index 0b7d77e..b803066 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java @@ -2,12 +2,12 @@ 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.MesDb; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource; /** * @Author: Wynne.Lu * @CreateDate: 2019/9/27 1:58 PM * @Description: **/ -public interface MesDbRepository extends BaseRepository { +public interface MesDatasourceRepository extends BaseRepository { } From 203b53d3b3e614e0ce1bca41e7a76f29047d2924 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 16 Oct 2019 13:40:51 +0800 Subject: [PATCH 03/82] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) 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 e69de29..0f2aa79 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 @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:17 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATASOURCE") +@Api("地址清单") +public class MesDatasource extends BaseBean { + + @Column(name="DS_CODE") + @ApiParam("数据源代码") + private String dsCode; + + @Column(name="DS_NAME") + @ApiParam("数据源名称") + private String dsName; + + @Column(name="DS_TYPE") + @ApiParam("数据源类型") + private String dsType; + + @Column(name="DS_HOST") + @ApiParam("主机") + private String dsHost; + + @Column(name="DS_PORT") + @ApiParam("端口") + private Integer dsPort; + + @Column(name="DS_USER") + @ApiParam("用户名") + private String dsUser; + + @Column(name="DS_PASSWORD") + @ApiParam("密码") + private String dsPassword; + + @Column(name = "DS_DB_NAME") + @ApiParam("数据库名称") + private String dsDbName; + + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + +} From 14123c008e096b9a6bd9425b305a3db337313e0c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 16 Oct 2019 15:21:26 +0800 Subject: [PATCH 04/82] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 a507c64..7005067 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 @@ -51,7 +51,7 @@ public class MesEquTaskPlan extends BaseBean { @Column(name="DAYS_IN_ADVANCE") @ApiParam("创建提前天数") - private String daysInAdvance; + private Integer daysInAdvance; @Transient @ApiParam(value="生产线") 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 f406591..3464fb4 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 @@ -26,7 +26,7 @@ public class MesEquTaskPlanModel implements Serializable { private String lastTime; @ApiParam("创建提前天数") - private String daysInAdvance; + private Integer daysInAdvance; @ApiParam("生产线") private String workCenterCode; @@ -66,7 +66,7 @@ public class MesEquTaskPlanModel implements Serializable { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, String daysInAdvance, 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 workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; From 8a316ff2d5040cb6f56b28a902f5168ac04c0eb0 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 16 Oct 2019 15:34:39 +0800 Subject: [PATCH 05/82] add mrp function to aps --- .../pojo/aps/annotation/FieldAnnotation.java | 15 +++++++++++---- .../pojo/aps/annotation/RippleAnnotation.java | 11 +++++++++-- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 4 ++++ .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 1 - .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 4 ++++ .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 22 +++++++++++++--------- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 12 ++---------- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 12 ++---------- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 8 ++++++++ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 18 +++++++++++++++++- .../pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java | 22 ++++++++++++++++++++++ .../i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java | 8 ++++++++ .../i3plus/pojo/aps/model/ResourceCompose.java | 18 ++++++++++++++++++ .../src/main/resources/relations/Work.xml | 4 ++-- .../src/main/resources/relations/WorkResource.xml | 2 +- 17 files changed, 145 insertions(+), 40 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 86caaa2..a8484af 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -5,12 +5,19 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @Description :字段元信息注解 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface FieldAnnotation { boolean property() default true; - boolean modify() default true; - boolean display() default true; - int pric() default 2; - boolean mainkey() default false; + boolean modify() default true; // 是否能修改 + boolean display() default true; // 是否需要在界面显示 + int pric() default 2; // 对于浮点型，界面显示的精度 + boolean mainkey() default false; // 是否为主键 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java index 9b577f0..26bfdf7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java @@ -5,9 +5,16 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @Description :字段传播依赖设置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface RippleAnnotation { - String[] dependence() default {}; - String method() default ""; + String[] dependence() default {}; // 字段依赖的路径 + String method() default ""; // 字段值计算时调用的方法，方法写在service中. } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index a6f4432..12c9683 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -58,6 +58,10 @@ public class BaseOrder extends BaseCode { @ApiParam(value ="接单日期") private Date receiveDate; + @Column(name="SPECIFY_MATERIAL_NUM") + @ApiParam(value ="专料号") + private String specifyMaterialNum; + @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index fb8b71f..0cfc671 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -4,7 +4,6 @@ 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.enums.IMPORT_DETAIL_TYPE; -import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index e6935d0..13689af 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -53,4 +53,8 @@ public class MatCalcRule extends BaseRule { @ApiParam(value ="批量补充") private Boolean batchSupply; + @Column(name="ASSIGN_LIMIT") + @ApiParam(value ="物料分配制约") + private Integer assignLimit; + } 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 f3f1368..4483e7e 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 @@ -72,19 +72,19 @@ public class Material extends BaseCode { @Column(name="IS_AUTO_FIX_PEGGING") @ApiParam(value ="自动补充标识") - private boolean autoFixPegging; + private Boolean autoFixPegging; - @Column(name="MAX_MANUF_BATCH") + @Column(name="MAX_PRODUCT_BATCH") @ApiParam(value ="最大制造批量") - private Double maxManufBatch; + private Double maxProductBatch; - @Column(name="MIN_MANUF_BATCH") + @Column(name="MIN_PRODUCT_BATCH") @ApiParam(value ="最小制造批量") - private Double minManufBatch; + private Double minProductBatch; - @Column(name="MANUF_UNIT_BATCH") + @Column(name="UNIT_PRODUCT_BATCH") @ApiParam(value ="制造批量单位") - private Double manufUnitBatch; + private Double UnitProductBatch; @Column(name="MAX_PUR_BATCH") @ApiParam(value ="最大采购批量") @@ -94,9 +94,9 @@ public class Material extends BaseCode { @ApiParam(value ="最小采购批量") private Double minPurBatch; - @Column(name="PUR_UNIT_BATCH") + @Column(name="UNIT_PUR_BATCH") @ApiParam(value ="采购批量单位") - private Double purUnitBatch; + private Double unitPurBatch; @Column(name="MIN_STOCK_COUNT") @ApiParam(value ="最小库存数量") @@ -110,6 +110,10 @@ public class Material extends BaseCode { @ApiParam(value ="最大库存数量") private Double maxStockCount; + @Column(name="ORDER_BATCH_PERIOD") + @ApiParam(value ="订单合并期间") + private String orderBatchPeriod; + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); 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 620909a..e14540e 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 @@ -50,21 +50,13 @@ public class Operation extends BaseAPS { private String ratio; @Column(name="COUNT") - @ApiParam(value ="分割数量") - private Double count; + @ApiParam(value ="分割的工作个数") + private Integer count; @Column(name="BATCH") @ApiParam(value ="分割批量") private Double batch; - @Column(name="MIN_BATCH") - @ApiParam(value ="最小批量") - private Double minBatch; - - @Column(name="TAIL_DEAL") - @ApiParam(value ="尾数处理") - private TAIL_DEAL tailDeal; - @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") private CONSTRAINT_TYPE consType; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 4a0d1e5..cabd90a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -30,21 +30,13 @@ public class StandOperation extends BaseCode { private String ratio; @Column(name="COUNT") - @ApiParam(value ="分割数量") - private Double count; + @ApiParam(value ="分割的工作个数") + private Integer count; @Column(name="BATCH") @ApiParam(value ="分割批量") private Double batch; - @Column(name="MIN_BATCH") - @ApiParam(value ="最小批量") - private Double minBatch; - - @Column(name="TAIL_DEAL") - @ApiParam(value ="尾数处理方式") - private TAIL_DEAL tailDeal; - @Column(name="DIRECTION") @ApiParam(value ="排程方向") private DIRECTION direction; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index e7c42df..a9992f3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -97,6 +97,22 @@ public class Work extends BaseCode { @ApiParam(value ="计划主资源") private String planResource; + @Column(name="FIX_SPLIT") + @ApiParam(value ="已分割的工作是否重新分割") + private Boolean fixSplit; + + @Column(name="NEED_PREV_COUNT") + @ApiParam(value ="需要的前工作数量") + private Double needPrevCount; + + @Column(name="SCH_FAILED") + @ApiParam(value ="是否排程失败") + private Boolean schFailed; + + @Column(name="FAILED_REASON") + @ApiParam(value ="排程失败原因") + private String failedReason; + @Column(name="ORDER_ID") @ApiParam(value ="订单") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 3b46af2..8b1c8f9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -7,6 +7,14 @@ import javax.persistence.MappedSuperclass; import java.util.HashMap; import java.util.Map; +/** + * @Description :APS基类 + * 对于APS所有实体类均需继承该类。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Data @MappedSuperclass public abstract class BaseAPS extends BaseBean { 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 a0f477b..de0cb5f 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 @@ -6,6 +6,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import java.util.*; import java.util.function.Consumer; +/** + * @Description :APS 实体对象的元信息 + * 包含实体对象之间的关联关系信息。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BeanInfo { private Class cls; private BeanInfo superBeanInfo; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index d5fb2b3..1eaa05e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -9,6 +9,14 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; +/** + * @Description :关联关系工具类 + * + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BeanRelation { Map, Map, List>>> caches = new HashMap<>(); @@ -74,6 +82,14 @@ public class BeanRelation { } public static T get(BaseBean bean, Predicate pred, Enum holder, Enum... args) { + List nextBeans = list(bean, holder); + for (BaseBean nextEntity : nextBeans) { + T result = getImpl(nextEntity, pred, args, 0); + if (result != null) { + return result; + } + } + return null; } @@ -149,7 +165,7 @@ public class BeanRelation { * @param relaBean */ public static void set(BaseBean bean, Enum holder, BaseBean relaBean) { - if (bean == null) { + if (bean == null || holder == null) { return; } if (relaBean == null) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java new file mode 100644 index 0000000..e068a04 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * 物料分配限制 + * 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间 + */ +public enum MATERIAL_ASSIGN_LIMIT { + NONE(0), // 不进行任何制约 + INVENTORY(1), // 库存制约 + PURCHASE(2), // 采购制约 + PRODUCT(4); // 制造制约 + + private int _value; + + MATERIAL_ASSIGN_LIMIT(int value) { + _value = value; + } + + public int value() { + return this._value; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java new file mode 100644 index 0000000..95383b4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum WORK_SPLIT_TYPE { + NONE, // 不分割 + RATIO, // 按比例分割 + COUNT, // 按数量分割 + BATCH // 按批量分割 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java new file mode 100644 index 0000000..314ecfa --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.WorkResource; + +import java.util.List; + +/** + * @Description :主副资源配套组合 + * 只允许一个主资源，可以有多个副资源，但同一套号的副资源不能有多个。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-11 + * @Modify: + **/ +public class ResourceCompose { + public WorkResource resource; + public List assResource; +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 3f8ab14..bd8ea37 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -4,7 +4,7 @@ - + @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml index 28b6264..1c21db2 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml @@ -1,6 +1,6 @@ - + From ce187f9720da92fb0d994482cf5830b81ad1b03f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 16 Oct 2019 15:55:42 +0800 Subject: [PATCH 06/82] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java | 4 ++++ .../cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java | 10 +++++++--- .../java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java index 9b2017c..afd4cb0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java @@ -32,6 +32,10 @@ public class AndonBroadCast extends BaseBean { @ApiParam("广播设备编号") private String targetIds; + @Column(name="GROUP_NO") + @ApiParam("分组号") + private String groupNo; + @Column(name="WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java index dfc769a..750e650 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java @@ -35,11 +35,15 @@ public class AndonBroadCastCfg extends BaseBean { @ApiParam("安灯类型代码") private String alarmCode; - @Column(name="DEVICE_NUM") - @ApiParam("广播设备编号") - private String targetIds; +// @Column(name="DEVICE_NUM") +// @ApiParam("广播设备编号") +// private String targetIds; @Column(name="WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + + @Column(name="GROUP_NO") + @ApiParam("分组号") + private String groupNo; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index fd44ca9..ad97b67 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -91,6 +91,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCast.getGroupNo(), "groupNo", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean); DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean); return packBean; @@ -106,7 +107,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getAlarmCode(), "alarmCode", packBean); - DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getTargetIds(), "targetIds", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getGroupNo(), "groupNo", packBean); DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean); return packBean; } From 6a9924eda60dc4751723319b1376761a78c0d91b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 16 Oct 2019 16:09:53 +0800 Subject: [PATCH 07/82] =?UTF-8?q?=E3=80=90VDA=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E3=80=91=20FIFO=E6=8E=A8=E8=8D=90=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java index 5adc7d5..6d68047 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -15,7 +15,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description :存储区 + * @Description :物料线路关系表 * @Reference : * @Author : hansen.ke * @CreateDate : 2018-11-06 11:50 @@ -38,7 +38,7 @@ public class WmsPartRouting extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路编号") private String routingCode; - + public WmsPartRouting(){} 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 9d5414b..a67bfda 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 @@ -15,7 +15,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description :存储区 + * @Description :物流线路规则表 * @Reference : * @Author : hansen.ke * @CreateDate : 2018-11-06 11:50 @@ -82,7 +82,7 @@ public class WmsRoutingRule extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路代码") private String routingCode; - + public WmsRoutingRule(){} } From 3828b4863cfabbde97b58222069800ea87f88963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 16 Oct 2019 17:36:47 +0800 Subject: [PATCH 08/82] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E8=B4=A8?= =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index aed40c4..c667ec4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -79,7 +79,7 @@ public class WmsPOMasterDetails extends BaseBean { @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") - private Double rcQty; + private Double rcQty = 0d; //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } 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 63abadc..b1e3261 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 @@ -163,6 +163,10 @@ public class WmsStockSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") private Integer snType = 10; + @Column(name = "QUALITY_DATE") + @ApiParam("保质期日期") + private String qualityDate; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 986157043daf7a4cd23a2224b1a14f58bace81b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 16 Oct 2019 21:50:51 +0800 Subject: [PATCH 09/82] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=8F=AF=E9=85=8D=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 7860945..fd3c9db 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 @@ -1520,6 +1520,7 @@ public class WmsEnumUtil { CHECKLIST(1, "可选列表"), NUMBER(10, "数字"), STRING(20, "字符串"), + CONFIGURABLE_STR(25, "可配字符串"), OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"); private int value; From 88754f9a71efb17ab05bbec8d1959270e76264c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 16 Oct 2019 21:52:02 +0800 Subject: [PATCH 10/82] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsPoAsnRecvModel.java | 35 ++++++++++------------ 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 0c43dd0..536f46c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -16,7 +16,7 @@ import java.time.LocalTime; **/ @Data @Api("供应商收货看板") -public class WmsPoAsnRecvModel extends BaseBean implements Comparable{ +public class WmsPoAsnRecvModel extends BaseBean implements Comparable { @ApiParam("订单号") private String orderNo; @@ -33,9 +33,9 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable Date: Thu, 17 Oct 2019 13:04:17 +0800 Subject: [PATCH 11/82] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 229 ++++++++++++++++++++- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 68 ++++++ .../i3plus/pojo/mes/bean/MesEquTaskDetail.java | 61 ++++++ .../estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 8 + .../mes/repository/MesEquTaskDetailRepository.java | 16 ++ .../mes/repository/MesEquTaskPlanRepository.java | 2 +- .../pojo/mes/repository/MesEquTaskRepository.java | 16 ++ .../repository/MesEquTaskStandardRepository.java | 2 +- 8 files changed, 399 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java 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 7bbf94e..784251b 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,7 +13,234 @@ public class MesEnumUtil { /** - * mes设备作业要求-作业类型 + * mes设备作业任务明细-执行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_ACTION_STATUS { + + PENDING(10, "待处理"), + COMPLETE(20, "已完成"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_ACTION_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; + } + + } + + /** + * mes设备作业任务明细-整体结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_FINAL_RESULT { + + YES(10, "合格"), + NO(20, "不合格"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业任务明细-维修标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG { + + FALSE(10, "否"), + TRUE(20, "是"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_STATUS { + + CREATE(10, "创建"), + LANDED(20, "下达"), + OPEN(30, "开启"), + CLOSE(40, "关闭"), + CANCEL(50, "取消"); + + private int value; + private String description; + + MES_EQU_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; + } + + } + + /** + * mes设备作业任务来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_SOURCE { + + PLAN(10, "周期计划"), + CREATE(20, "手工创建"), + ANDON(30, "ANDON"); + + private int value; + private String description; + + MES_EQU_TASK_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业通知标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_NOTIFY_FLAG { + + FALSE(10, "未通知"), + TRUE(20, "已通知"); + + private int value; + private String description; + + MES_EQU_TASK_NOTIFY_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes导入模块 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_INSERT_EXCEL { 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 new file mode 100644 index 0000000..2ab832c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -0,0 +1,68 @@ +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; + +/** + * @Description :设备作业任务 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK") +@Api("设备作业任务") +public class MesEquTask extends BaseBean { + + @Column(name="TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name="TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name="TASK_STATUS") + @ApiParam("作业状态") + private Integer taskStatus; + + @Column(name="WORK_CENTER_CODE") + @ApiParam(value="生产线") + private String workCenterCode; + + @Column(name="PLAN_TIME") + @ApiParam("计划日期") + private String planTime; + + @Column(name="TASK_SOURCE") + @ApiParam("任务来源") + private Integer taskSource; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="NOTIFY_FLAG") + @ApiParam("通知标识") + private Integer notifyFlag; + + @Column(name="RELATE_TASK") + @ApiParam("关联任务") + private String relateTask; + +} 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 new file mode 100644 index 0000000..089895b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -0,0 +1,61 @@ +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; + +/** + * @Description :设备作业任务明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK_DETAIL") +@Api("设备作业任务明细") +public class MesEquTaskDetail extends BaseBean { + + @Column(name="TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="ACTION_STATUS") + @ApiParam("执行状态") + private Integer actionStatus; + + @Column(name="FINAL_RESULT") + @ApiParam("整体结果") + private Integer finalResult; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="REPAIR_FLAG") + @ApiParam("维修标识") + private Integer repairFlag; + + +} 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 7005067..222fcdf 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 @@ -61,4 +61,12 @@ public class MesEquTaskPlan extends BaseBean { @ApiParam(value="设备类别") private String equipmentCategory; + @Transient + @ApiParam("计划日期") + private String planTime; + + @Transient + @ApiParam("作业任务编号") + private String taskNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java new file mode 100644 index 0000000..5452007 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java index 33c9dc1..59d6144 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; /** * @Description : * @Reference : - * @Author : 王杰 + * @Author : wangjie * @CreateDate : 2019-10-11 * @Modify: **/ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java new file mode 100644 index 0000000..6e1ce77 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java index 49e83b9..488bec3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; /** * @Description : * @Reference : - * @Author : 王杰 + * @Author : wangjie * @CreateDate : 2019-10-11 * @Modify: **/ From 97763d6b53bde16632643e39e98133937f140dd9 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 17 Oct 2019 16:06:05 +0800 Subject: [PATCH 12/82] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?= =?UTF-8?q?=EF=BC=8C=20=E5=AE=89=E7=81=AF=E7=AE=A1=E7=90=86=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=90=8C=E7=95=8C=E9=9D=A2=EF=BC=8C=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=9D=A5=E6=BA=90=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 56 ++++++++++++++++++++-- .../i3plus/pojo/andon/bean/AndonManageRecord.java | 49 +++++++++++++++++++ .../i3plus/pojo/andon/bean/AndonQueueAttach.java | 55 +++++++++++++++++++-- .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 14 ++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 4 +- 5 files changed, 171 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index dbdc07e..ae634b1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -353,6 +353,59 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "事件统计报表该事件描述的总次数") private int acCodeTime; + @ApiParam(value = "操作来源") + @Transient + private String operationFlag; + + // 安灯附属表 + @Transient + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Transient + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Transient + @ApiParam(value ="客户") + private String customer; + + @Transient + @ApiParam(value ="零件号") + private String partNo; + + @Transient + @ApiParam(value ="零件名称") + private String partName; + + @Transient + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Transient + @ApiParam(value ="批次") + private String lot; + + @Transient + @ApiParam(value ="零件数量") + private Double partNum; + + @Transient + @ApiParam(value ="设备名称") + private String deviceName; + + @Transient + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Transient + @ApiParam(value ="备件名称") + private String backupPartName; + + @Transient + @ApiParam(value ="规格型号") + private String scale; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; @@ -474,9 +527,6 @@ public class AndonManageQueue extends BaseBean { try { List ds = new ArrayList(); ds.add(new AndonManageQueue()); - - - System.out.println(BeanUtils.describe(ds)); } catch (IllegalAccessException e) { e.printStackTrace(); diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index d66158f..f47728f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -272,6 +272,55 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "响应已通知标识") private String signSendFlag; + // 安灯附属表 + @Transient + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Transient + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Transient + @ApiParam(value ="客户") + private String customer; + + @Transient + @ApiParam(value ="零件号") + private String partNo; + + @Transient + @ApiParam(value ="零件名称") + private String partName; + + @Transient + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Transient + @ApiParam(value ="批次") + private String lot; + + @Transient + @ApiParam(value ="零件数量") + private Double partNum; + + @Transient + @ApiParam(value ="设备名称") + private String deviceName; + + @Transient + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Transient + @ApiParam(value ="备件名称") + private String backupPartName; + + @Transient + @ApiParam(value ="规格型号") + private String scale; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index aaf5666..739613c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -40,7 +40,56 @@ public class AndonQueueAttach extends BaseBean { @ApiParam(value ="安灯任务编号") private String andonOrderNo; - @Column(name="STATUS_CODE") - @ApiParam(value ="安灯状态") - private String statusCode; +// @Column(name="STATUS_CODE") +// @ApiParam(value ="安灯状态") +// private String statusCode; + + @Column(name="TEMP_CORT_METHOD") + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Column(name="PRE_CORT_METHOD") + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Column(name="CUSTOMER") + @ApiParam(value ="客户") + private String customer; + + @Column(name="PART_NO") + @ApiParam(value ="零件号") + private String partNo; + + @Column(name="PART_NAME") + @ApiParam(value ="零件名称") + private String partName; + + @Column(name="SCRAP_NUM") + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Column(name="LOT") + @ApiParam(value ="批次") + private String lot; + + @Column(name="PART_NUM") + @ApiParam(value ="零件数量") + private Double partNum; + + @Column(name="DEVICE_NAME") + @ApiParam(value ="设备名称") + private String deviceName; + + @Column(name="IS_CHANGE_BACKUP") + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Column(name="BACKUP_PART_NAME") + @ApiParam(value ="备件名称") + private String backupPartName; + + @Column(name="SCALE") + @ApiParam(value ="规格型号") + private String scale; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index ad97b67..044f313 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -111,6 +111,20 @@ public class AndonHqlPack { DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean); return packBean; } + + /** + * 安灯附属表 + * @param andonQueueAttach + * @return + */ + public static DdlPackBean getAndonQueueAttach(AndonQueueAttach andonQueueAttach) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonQueueAttach.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonQueueAttach.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(andonQueueAttach.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean); + return packBean; + } /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 2193643..ce28bb4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -462,7 +462,9 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_OPERATION_SOURCE{ PHYSICAL("10","物理操作"), - SOFT("20","软件操作"); + SOFT("20","软件操作"), + SCHEDULE("30","队列，定时操作"), + INSERT("40","插入动作"); private String value; private String description; From 48a6cdc39ce21c425a89f6df284800ad3b583e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 17 Oct 2019 16:57:53 +0800 Subject: [PATCH 13/82] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B=20=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 fd3c9db..01f31a2 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 @@ -792,7 +792,10 @@ public class WmsEnumUtil { VDAINSTOCK("VDAINSTOCK", "VDA入库"), VDAMOVESTOCK("VDAMOVESTOCK", "VDA内部移库"), VDA_FAST_STOCK("VDA_FAST_STOCK", "VDA采购快速入库"), - VDAREPORT("VDAREPORT", "VDA生产报工"); + VDAREPORT("VDAREPORT", "VDA生产报工"), + VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"), + VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"), + VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"); private String value; private String description; From 5e7fb00d0cfdb340805f9a1c915089657773a734 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 17 Oct 2019 18:59:36 +0800 Subject: [PATCH 14/82] =?UTF-8?q?=E3=80=90=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 01f31a2..822a771 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 @@ -621,7 +621,9 @@ public class WmsEnumUtil { AMPR(230, "AMPR", "AMPR"), FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"), VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"), - VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"); + VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"), + VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"), + VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"); private int value; From 56d74578263a1231d9e5359893c8b0daf3685492 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 17 Oct 2019 19:16:02 +0800 Subject: [PATCH 15/82] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 + .../i3plus/pojo/mes/pcn/bean/MesCellFeed.java | 10 +-- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 24 ++++-- .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 95 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 4 +- .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 61 ++++++++++++++ .../pcn/repository/MesProductDataRepository.java | 16 ++++ .../MesWorkCellMonitorLogRepository.java | 13 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 10 +-- .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 95 ++++++++++++++++++++++ .../pojo/mes/bean/MesWorkCellMonitorLog.java | 61 ++++++++++++++ .../mes/repository/MesProductDataRepository.java | 16 ++++ .../i3plus/pojo/model/mes}/StationRequestBean.java | 10 ++- .../cn/estsh/i3plus/pojo/model/mes/StepModel.java | 12 +++ 14 files changed, 406 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java rename modules/{i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes}/StationRequestBean.java (90%) 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 7bbf94e..478b538 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 @@ -1242,6 +1242,7 @@ public class MesEnumUtil { CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), + RUNNING_INFO("runningInfo", "运行信息"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); 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 7b4d5df..b73cd80 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 @@ -14,10 +14,10 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :mes系统业务动作 + * @Description :工位投料信息 * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 * @Modify: **/ @Data @@ -54,7 +54,7 @@ public class MesCellFeed extends BaseBean { @Column(name = "RAW_QTY") @ApiParam("特殊批次") - private Long rawQty; + private Double rawQty; @Column(name = "LOT_NO") @ApiParam("关联批次") @@ -64,7 +64,7 @@ public class MesCellFeed extends BaseBean { @ApiParam("供应商代码") private String supplierCode; - public long getRawQtyVal() { + 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/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 756aea5..bb74b3e 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -27,6 +28,7 @@ import javax.persistence.Table; @Api("PLC配置表") public class MesPlc extends BaseBean { + @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; @@ -63,23 +65,31 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; - @Column(name="EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") + @ApiParam("生产线") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") + @ApiParam("工位") private String workCellCode; - @Column(name = "ENABLED") - @ApiParam("是否启用 0 false 1 true") - private Integer enabled; - @Column(name = "PLC_CFG") @ApiParam("PLC的值的设定") private String plcCfg; + + @Column(name = "ANALYSIS_RULE") + @ApiParam("解析规则") + private String analysisRule; + + @Column(name = "IS_ANALYSIS") + @ApiParam("是否解析") + private String isAnalysis; + + @Transient + @ApiParam("设备名称") + private String equipmentName; } 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 new file mode 100644 index 0000000..f7d8843 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -0,0 +1,95 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :生产数据 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-10-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_DATA") +@Api("生产数据") +public class MesProductData extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_DESC") + @ApiParam("物料名称") + private String partDesc; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_VALUE") + @ApiParam("字段值") + private String fieldValue; + + @Column(name = "ROW_NO") + @ApiParam("数据行号") + private String rowNo; + + @Column(name = "GROUP_NO") + @ApiParam("数据组号") + private String groupNo; + +} 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 7f01147..4a2bae6 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 @@ -46,7 +46,7 @@ public class MesRawPartSn extends BaseBean { @Column(name = "RAW_QTY") @ApiParam("数量") - private Long rawQty; + private Double rawQty; @Column(name = "LOT_NO") @ApiParam("生产批次") @@ -64,7 +64,7 @@ public class MesRawPartSn extends BaseBean { @ApiParam("供应商代码") private String supplierCode; - public long getRawQtyVal() { + 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/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java new file mode 100644 index 0000000..f8eb168 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/16 2:42 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Api("工位监控异常信息") +public class MesWorkCellMonitorLog extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单") + private String workOrderNo; + + @Column(name = "STEP_CODE") + @ApiParam("工步") + private String stepCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序") + private String processCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程") + private String routeCOde; + + @Column(name="MESSAGE") + @ApiParam("异常信息") + private String message; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java new file mode 100644 index 0000000..eb8debf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProductDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java new file mode 100644 index 0000000..672947b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java @@ -0,0 +1,13 @@ +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.MesWorkCellMonitorLog; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesWorkCellMonitorLogRepository extends BaseRepository { +} 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 dccf4fb..5505b11 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 @@ -14,10 +14,10 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :mes系统业务动作 + * @Description :工位投料信息 * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 * @Modify: **/ @Data @@ -54,7 +54,7 @@ public class MesCellFeed extends BaseBean { @Column(name = "RAW_QTY") @ApiParam("特殊批次") - private Long rawQty; + private Double rawQty; @Column(name = "LOT_NO") @ApiParam("关联批次") @@ -65,7 +65,7 @@ public class MesCellFeed extends BaseBean { private String supplierCode; - public long getRawQtyVal() { + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } 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 new file mode 100644 index 0000000..ddd2dde --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -0,0 +1,95 @@ +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; + +/** + * @Description :生产数据 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-10-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_DATA") +@Api("生产数据") +public class MesProductData extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_DESC") + @ApiParam("物料名称") + private String partDesc; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_VALUE") + @ApiParam("字段值") + private String fieldValue; + + @Column(name = "ROW_NO") + @ApiParam("数据行号") + private String rowNo; + + @Column(name = "GROUP_NO") + @ApiParam("数据组号") + private String groupNo; + +} 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 new file mode 100644 index 0000000..2aa0975 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/16 2:42 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Api("工位监控异常信息") +public class MesWorkCellMonitorLog extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "workOrderNo") + @ApiParam("工单") + private String workOrderNo; + + @Column(name = "STEP_CODE") + @ApiParam("工步") + private String stepCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序") + private String processCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程") + private String routeCOde; + + @Column(name="MESSAGE") + @ApiParam("异常信息") + private String message; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java new file mode 100644 index 0000000..3f8880c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProductData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProductDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java similarity index 90% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index da1d6ed..e6e47f3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -1,11 +1,12 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; +package cn.estsh.i3plus.pojo.model.mes; + + -import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.io.Serializable; +import java.util.List; /** * @Description : 工位请求bean @@ -64,4 +65,7 @@ public class StationRequestBean implements Serializable { @ApiParam("托盘号") private String tray; + + @ApiParam("工步列表") + private List stepList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java index 19bf279..34409f4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java @@ -47,6 +47,18 @@ public class StepModel implements Serializable { private boolean isComplete; /** + * 工步颜色 + */ + @ApiParam + private String color; + + /** + * 异常信息 + */ + @ApiParam + private String exMsg; + + /** * 工位扫描业务所需使用字段 */ @ApiParam("工步是否跳过") From 7fc439319efa11c52f62ae583bf35d9661bb5817 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 17 Oct 2019 20:47:39 +0800 Subject: [PATCH 16/82] =?UTF-8?q?=E8=BF=94=E5=8E=82=E8=BF=94=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 98 +++++++++++++++++++++- .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 42 ++++++++++ .../i3plus/pojo/mes/pcn/bean/MesDefectCause.java | 42 ++++++++++ .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 69 +++++++++++++++ .../pojo/mes/pcn/bean/MesDismantleRecord.java | 86 +++++++++++++++++++ .../pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 46 ++++++++++ .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 4 + .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 86 +++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 70 ++++++++++++++++ .../i3plus/pojo/mes/pcn/model/RequestModel.java | 34 +++++++- .../pcn/repository/MesDefectCauseRepository.java | 14 ++++ .../pcn/repository/MesDefectRecordRepository.java | 14 ++++ .../mes/pcn/repository/MesDefectRepository.java | 14 ++++ .../repository/MesDismantleRecordRepository.java | 14 ++++ .../MesProduceCtgyPictureRepository.java | 14 ++++ .../pcn/repository/MesRepairRecordRepository.java | 14 ++++ .../pcn/repository/MesScrapRecordRepository.java | 14 ++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 42 ++++++++++ .../estsh/i3plus/pojo/mes/bean/MesDefectCause.java | 42 ++++++++++ .../i3plus/pojo/mes/bean/MesDefectRecord.java | 20 +++-- .../i3plus/pojo/mes/bean/MesDismantleRecord.java | 86 +++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPartObject.java | 42 ++++++++++ .../pojo/mes/bean/MesProduceCtgyPicture.java | 46 ++++++++++ .../i3plus/pojo/mes/bean/MesRepairRecord.java | 86 +++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesScrap.java | 4 + .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 66 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java | 46 ++++++++++ .../mes/repository/MesDefectCauseRepository.java | 14 ++++ .../pojo/mes/repository/MesDefectRepository.java | 14 ++++ .../MesProduceCtgyPictureRepository.java | 14 ++++ .../pojo/mes/repository/MesTypeCfgRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 83 ++++++++++++++++++ 32 files changed, 1284 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectCauseRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCtgyPictureRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTypeCfgRepository.java 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 7bbf94e..1391a5d 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,6 +13,101 @@ public class MesEnumUtil { /** + * mes 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_REPAIR_STATUS { + + REPAIRED(1, "已维修"), + NO_REPAIR(2, "未维修"); + + private int value; + private String description; + + MES_REPAIR_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_REPAIR_STATUS getByValue(int value) { + for (MES_REPAIR_STATUS mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_OPERATE_TYPE { + + MES_QUALITY_JUDGEMENT(10, "质量判定"); + + private int value; + private String description; + + MES_OPERATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_OPERATE_TYPE getByValue(int value) { + for (MES_OPERATE_TYPE mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes设备作业要求-作业类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -695,7 +790,8 @@ public class MesEnumUtil { public enum PASS_FAIL { PASS(1, "合格"), - FAIL(2, "不合格"); + FAIL(2, "不合格"), + SCRAP(3, "报废"); private int value; private String description; 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 new file mode 100644 index 0000000..09d4d3d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT") +@Api("缺陷表") +public class MesDefect extends BaseBean { + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DEFECT_TYPE") + @ApiParam("缺陷类型") + private String defectType; +} 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 new file mode 100644 index 0000000..5d312e2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_CAUSE") +@Api("缺陷原因表") +public class MesDefectCause extends BaseBean { + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "DC_TYPE") + @ApiParam("缺陷原因类型") + private String dcType; +} 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 new file mode 100644 index 0000000..72d0b14 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 19:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_DEFECT_RECORD") +@Api("不良信息记录表") +public class MesDefectRecord extends BaseBean { + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name="DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name="DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name="DEFECT_LOCATION") + @ApiParam("缺陷位置") + private Integer defectLocation; + + @Column(name="REPAIR_STATUS") + @ApiParam("维修状态") + private Integer repairStatus; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; +} 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 new file mode 100644 index 0000000..a114b7a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DISMANTLE_RECORD") +@Api("物料拆解记录表") +public class MesDismantleRecord extends BaseBean { + + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Integer qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private Integer dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private Integer okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private Integer missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private Integer scrapQty; + + @Column(name = "MEMO") + @ApiParam("备注") + private String meno; +} 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 new file mode 100644 index 0000000..eb67cfc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CTGY_PICTURE") +@Api("产品类型图片表") +public class MesProduceCtgyPicture extends BaseBean { + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCtgyCode; + + @Column(name = "SIDE_LOCATION") + @ApiParam("面位") + private String sideLocation; + + @Column(name = "PICTURE_URL") + @ApiParam("图片URL") + private String pictureUrl; + + @Column(name = "PICTURE_NAME") + @ApiParam("图片名称") + private String pictureName; +} 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 286009a..e1ce74e 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 @@ -121,6 +121,10 @@ public class MesProduceSn extends BaseBean { @ApiParam("返回信息") private String resultMsg; + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } 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 new file mode 100644 index 0000000..a3ce644 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_REPAIR_RECORD") +@Api("维修信息记录表") +public class MesRepairRecord extends BaseBean { + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "SIDE_LOCATION") + @ApiParam("产品面位") + private String sideLocation; + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置") + private String defectLocation; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因描述") + private String dcName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String meno; +} 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 new file mode 100644 index 0000000..e83ca89 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRAP_RECORD") +@Api("报废信息记录表") +public class MesScrapRecord extends BaseBean { + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "SCRAP_CODE") + @ApiParam("报废代码") + private String repairCode; + + @Column(name = "SCRAP_NAME") + @ApiParam("报废名称") + private String scrapName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "SCRAP_REASON") + @ApiParam("报废原因") + private String scrapReason; + + @Column(name = "MEMO") + @ApiParam("备注") + private String meno; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java index 9ffc448..bec442b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.pcn.bean.*; import java.util.List; @@ -15,6 +13,12 @@ import java.util.List; **/ public class RequestModel { + private List mesDefectRecordList; // 不良/缺陷记录数据集 + + private List mesRepairRecordList; // 维修记录数据集 + + private List dismantleRecordList; // 拆解记录数据集 + private List workOrderList; // 工单数据集 private List partList; // 物料数据集 @@ -46,6 +50,30 @@ public class RequestModel { this.partList = partList; } + public List getMesDefectRecordList() { + return mesDefectRecordList; + } + + public void setMesDefectRecordList(List mesDefectRecordList) { + this.mesDefectRecordList = mesDefectRecordList; + } + + public List getMesRepairRecordList() { + return mesRepairRecordList; + } + + public void setMesRepairRecordList(List mesRepairRecordList) { + this.mesRepairRecordList = mesRepairRecordList; + } + + public List getDismantleRecordList() { + return dismantleRecordList; + } + + public void setDismantleRecordList(List dismantleRecordList) { + this.dismantleRecordList = dismantleRecordList; + } + public List getWorkOrderList() { return workOrderList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java new file mode 100644 index 0000000..c0ecd89 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectCause; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:04 + * @Modify: + **/ +public interface MesDefectCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java new file mode 100644 index 0000000..c8a7a7b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefectRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:05 + * @Modify: + **/ +public interface MesDefectRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java new file mode 100644 index 0000000..274f334 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:04 + * @Modify: + **/ +public interface MesDefectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java new file mode 100644 index 0000000..e093fe2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:06 + * @Modify: + **/ +public interface MesDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java new file mode 100644 index 0000000..2edb306 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCtgyPicture; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:35 + * @Modify: + **/ +public interface MesProduceCtgyPictureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java new file mode 100644 index 0000000..1325e76 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRepairRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:06 + * @Modify: + **/ +public interface MesRepairRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java new file mode 100644 index 0000000..0f3e5eb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesScrapRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:07 + * @Modify: + **/ +public interface MesScrapRecordRepository extends BaseRepository { +} 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 new file mode 100644 index 0000000..58110f3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -0,0 +1,42 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT") +@Api("缺陷表") +public class MesDefect extends BaseBean { + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DEFECT_TYPE") + @ApiParam("缺陷类型") + private String defectType; +} 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 new file mode 100644 index 0000000..b98052e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java @@ -0,0 +1,42 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_CAUSE") +@Api("缺陷原因表") +public class MesDefectCause extends BaseBean { + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "DC_TYPE") + @ApiParam("缺陷原因类型") + private String dcType; +} 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 9500bb0..79cf7f5 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 @@ -26,7 +26,7 @@ import java.util.Date; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="MES_DEFECT_RECORD") -@Api("生产工单") +@Api("不良信息记录表") public class MesDefectRecord extends BaseBean { @Column(name="SERIAL_NUMBER") @ApiParam("产品条码") @@ -36,10 +36,22 @@ public class MesDefectRecord extends BaseBean { @ApiParam("物料号") private String partNo; + @Column(name="PART_NAME") + @ApiParam("物料名称") + private String partName; + @Column(name="DEFECT_CODE") - @ApiParam("不良代码") + @ApiParam("缺陷代码") private String defectCode; + @Column(name="DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name="DEFECT_LOCATION") + @ApiParam("缺陷位置") + private Integer defectLocation; + @Column(name="REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; @@ -55,8 +67,4 @@ public class MesDefectRecord extends BaseBean { @Column(name="MEMO") @ApiParam("备注") private String memo; - - public int getRepairStatusVal() { - return this.repairStatus == null ? 0 : this.repairStatus; - } } 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 new file mode 100644 index 0000000..d340256 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -0,0 +1,86 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DISMANTLE_RECORD") +@Api("物料拆解记录表") +public class MesDismantleRecord extends BaseBean { + + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Integer qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private Integer dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private Integer okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private Integer missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private Integer scrapQty; + + @Column(name = "MEMO") + @ApiParam("备注") + private String meno; +} 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 new file mode 100644 index 0000000..b950b1a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -0,0 +1,42 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_OBJECT") +@Api("物料对象配置表") +public class MesPartObject extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("物料名称") + private String objectName; +} 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 new file mode 100644 index 0000000..445c18d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -0,0 +1,46 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CTGY_PICTURE") +@Api("产品类型图片表") +public class MesProduceCtgyPicture extends BaseBean { + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCtgyCode; + + @Column(name = "SIDE_LOCATION") + @ApiParam("面位") + private String sideLocation; + + @Column(name = "PICTURE_URL") + @ApiParam("图片URL") + private String pictureUrl; + + @Column(name = "PICTURE_NAME") + @ApiParam("图片名称") + private String pictureName; +} 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 new file mode 100644 index 0000000..ba6331c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -0,0 +1,86 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_REPAIR_RECORD") +@Api("维修信息记录表") +public class MesRepairRecord extends BaseBean { + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "SIDE_LOCATION") + @ApiParam("产品面位") + private String sideLocation; + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置") + private String defectLocation; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因描述") + private String dcName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String meno; +} 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 39c21f7..efe9449 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 @@ -36,4 +36,8 @@ public class MesScrap extends BaseBean { @ApiParam("报废名称") private String scrapName; + @Column(name="SCRAP_TYPE") + @ApiParam("报废类型") + private String scrapType; + } 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 new file mode 100644 index 0000000..4dd7e2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -0,0 +1,66 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRAP_RECORD") +@Api("报废信息记录表") +public class MesScrapRecord extends BaseBean { + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "SCRAP_CODE") + @ApiParam("报废代码") + private String repairCode; + + @Column(name = "SCRAP_NAME") + @ApiParam("报废名称") + private String scrapName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String meno; +} 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 new file mode 100644 index 0000000..d2a2158 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -0,0 +1,46 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TYPE_CFG") +@Api("类型信息表") +public class MesTypeCfg extends BaseBean { + + @Column(name = "TYPE_CODE") + @ApiParam("类型代码") + private String typeCode; + + @Column(name = "TYPE_NAME") + @ApiParam("类型名称") + private String typeName; + + @Column(name = "BUSINESS_TYPE_CODE") + @ApiParam("业务类型代码") + private String businessTypeCode; + + @Column(name = "BUSINESS_TYPE_NAME") + @ApiParam("业务类型名称") + private String businessTypeName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectCauseRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectCauseRepository.java new file mode 100644 index 0000000..abf444f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectCauseRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDefectCause; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 16:56 + * @Modify: + **/ +public interface MesDefectCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRepository.java new file mode 100644 index 0000000..babd650 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:24 + * @Modify: + **/ +public interface MesDefectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCtgyPictureRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCtgyPictureRepository.java new file mode 100644 index 0000000..35ae5e9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCtgyPictureRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:44 + * @Modify: + **/ +public interface MesProduceCtgyPictureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTypeCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTypeCfgRepository.java new file mode 100644 index 0000000..ca0e370 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTypeCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTypeCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 16:29 + * @Modify: + **/ +public interface MesTypeCfgRepository 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 ad38b80..aa03c0b 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 @@ -1391,4 +1391,87 @@ public class MesHqlPack { } return packBean; } + + /** + * MES 缺陷查询条件封装 + * @param mesDefect + * @param organizeCode + * @return + */ + public static DdlPackBean getMesDefect(MesDefect mesDefect, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesDefect, organizeCode); + if (!StringUtils.isEmpty(mesDefect.getDefectCode())) { + DdlPreparedPack.getStringLikerPack(mesDefect.getDefectCode(), "defectCode", packBean); + } + if (!StringUtils.isEmpty(mesDefect.getDefectName())) { + DdlPreparedPack.getStringLikerPack(mesDefect.getDefectName(), "defectName", packBean); + } + if (!StringUtils.isEmpty(mesDefect.getDefectType())) { + DdlPreparedPack.getStringLikerPack(mesDefect.getDefectType(), "defectType", packBean); + } + return packBean; + } + + /** + * MES 产品类型图片查询条件封装 + * @param mesProduceCtgyPicture + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode); + if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCtgyCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) { + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean); + } + if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) { + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean); + } + return packBean; + } + + /** + * MES 类型信息查询条件封装 + * @param mesTypeCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode); + if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) { + DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); + } + if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) { + DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); + } + if (!StringUtils.isEmpty(mesTypeCfg.getTypeName())) { + DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeName(), "typeName", packBean); + } + if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeName())) { + DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeName(), "businessTypeName", packBean); + } + return packBean; + } + + /** + * MES 缺陷原因查询条件封装 + * @param mesDefectCause + * @param organizeCode + * @return + */ + public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesDefectCause, organizeCode); + if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean); + } + if (!StringUtils.isEmpty(mesDefectCause.getDcName())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean); + } + if (!StringUtils.isEmpty(mesDefectCause.getDcType())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcType(), "dcType", packBean); + } + return packBean; + } } From 5a036f14cb88c0097a1011aebc792b15ca8cd1b8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 17 Oct 2019 21:16:15 +0800 Subject: [PATCH 17/82] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 +- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 18 ++++ .../pojo/mes/model/MesEquTaskDetailModel.java | 105 +++++++++++++++++++++ .../i3plus/pojo/mes/model/MesEquTaskModel.java | 97 +++++++++++++++++++ .../i3plus/pojo/mes/model/MesEquipmentModel.java | 9 ++ 5 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java 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 6f63bf5..a84a9a3 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 @@ -289,10 +289,10 @@ public class MesEnumUtil { } /** - * mes设备作业要求-作业类型 + * mes设备-作业类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_STANDARD_TASK_TYPE { + public enum MES_EQU_TASK_TYPE { CHECK(10, "点检"), MAINTAIN(20, "保养"), @@ -301,7 +301,7 @@ public class MesEnumUtil { private int value; private String description; - MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) { + MES_EQU_TASK_TYPE(int value, String description) { this.value = value; this.description = description; } 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 2ab832c..c4cf2a1 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 @@ -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.util.List; /** * @Description :设备作业任务 @@ -65,4 +67,20 @@ public class MesEquTask extends BaseBean { @ApiParam("关联任务") private String relateTask; + @Transient + @ApiParam(value = "设备代码") + private String equipmentCode; + + @Transient + @ApiParam(value = "计划日期起始时间") + private String planTimeStart; + + @Transient + @ApiParam(value = "计划日期结束时间") + private String planTimeEnd; + + @Transient + @ApiParam(value ="明细列表") + private List mesEquTaskDetailList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java new file mode 100644 index 0000000..e870983 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java @@ -0,0 +1,105 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskDetailModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("作业任务编号") + private String taskNo; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("执行状态") + private Integer actionStatus; + + @ApiParam("整体结果") + private Integer finalResult; + + @ApiParam("备注") + private String memo; + + @ApiParam("维修标识") + private Integer repairFlag; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam(value="生产线") + private String workCenterCode; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("执行状态") + private String actionStatusName; + + @ApiParam("整体结果") + private String finalResultName; + + @ApiParam("维修标识") + private String repairFlagName; + + @ApiParam("作业类型") + private String taskTypeName; + + + public MesEquTaskDetailModel() { + + } + + public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, String workCenterCode) { + this.id = id; + this.taskNo = taskNo; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.workCenterCode = workCenterCode; + } + + public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, Integer actionStatus, Integer finalResult, String memo, Integer repairFlag, Integer taskType, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.taskNo = taskNo; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.actionStatus = actionStatus; + this.finalResult = finalResult; + this.memo = memo; + this.repairFlag = repairFlag; + this.taskType = taskType; + this.workCenterCode = workCenterCode; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java new file mode 100644 index 0000000..71f9cea --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("作业任务编号") + private String taskNo; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("作业状态") + private Integer taskStatus; + + @ApiParam(value="生产线") + private String workCenterCode; + + @ApiParam("计划日期") + private String planTime; + + @ApiParam("任务来源") + private Integer taskSource; + + @ApiParam("备注") + private String memo; + + @ApiParam("通知标识") + private Integer notifyFlag; + + @ApiParam("关联任务") + private String relateTask; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("作业状态") + private String taskStatusName; + + @ApiParam("任务来源") + private String taskSourceName; + + @ApiParam("通知标识") + private String notifyFlagName; + + + public MesEquTaskModel() { + + } + + public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.taskNo = taskNo; + this.taskType = taskType; + this.taskStatus = taskStatus; + this.workCenterCode = workCenterCode; + this.planTime = planTime; + this.taskSource = taskSource; + this.memo = memo; + this.notifyFlag = notifyFlag; + this.relateTask = relateTask; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} 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 5e09c06..e68233c 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,15 @@ public class MesEquipmentModel implements Serializable { } + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.status = status; + this.workCenterCode = workCenterCode; + this.equipmentCategory = equipmentCategory; + } + public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) { this.wcId = wcId; this.id = id; From 16839f69119a7a6ae1bbc9e2e624ea97765908db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 18 Oct 2019 09:38:57 +0800 Subject: [PATCH 18/82] =?UTF-8?q?=E6=88=90=E5=93=81=E5=86=B2=E9=94=80+?= =?UTF-8?q?=E6=8A=9B=E5=BC=82=E5=B8=B8=E6=96=B9=E6=B3=95=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsWriteOffModel.java | 22 +++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 46 +++++++++++----------- 2 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java new file mode 100644 index 0000000..a72ed67 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description 冲销Model + * @Reference + * @Author dragon + * @CreateDate 2019/10/18 1:18 + * @Modify + */ +@Data +public class WmsWriteOffModel implements Serializable { + private static final long serialVersionUID = -5490167040159056107L; + private String locateNo; + private List snList; + private List> summaryList; +} 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 8c3b8a2..3f75fd5 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 @@ -42,7 +42,7 @@ public class WmsMoveMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer orderStatus; @Column(name = "REMARK") @@ -58,7 +58,7 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "错误信息") private String errorMessage; - @Column(name="IS_URGENT") + @Column(name = "IS_URGENT") @ApiParam(value = "是否紧急", example = "0") public Integer isUrgent; @@ -68,7 +68,7 @@ public class WmsMoveMaster extends BaseBean { @Column(name = "BUSI_TYPE_CODE") @ApiParam(value = "业务类型编码") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @Column(name = "REF_ORDER_NO") @@ -81,7 +81,7 @@ public class WmsMoveMaster extends BaseBean { @Transient @ApiParam("状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; @Transient @@ -140,7 +140,7 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; - @Column(name="FIX_ID") + @Column(name = "FIX_ID") @ApiParam(value = "设备编号") public String fixId; @@ -164,16 +164,17 @@ public class WmsMoveMaster extends BaseBean { return isSnapshot == null ? 0 : isSnapshot.intValue(); } - public WmsMoveMaster(){}; + public WmsMoveMaster() { + } - public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, - Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark, - String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser,String fixId, + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, + Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark, + String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId, Double sumTranQty) { this.orderNo = orderNo; this.orderStatus = orderStatus; this.remark = remark; - this.isUrgent=isUrgent; + this.isUrgent = isUrgent; this.transTypeCode = transTypeCode; this.errorMessage = errorMessage; this.busiTypeCode = busiTypeCode; @@ -182,18 +183,18 @@ public class WmsMoveMaster extends BaseBean { this.refOrderNo = refOrderNo; this.carNo = carNo; this.refSrc = refSrc; - this.organizeCode =organizeCode; - this.createDatetime= createDatetime; + this.organizeCode = organizeCode; + this.createDatetime = createDatetime; this.createUser = createUser; - this.modifyDatetime =modifyDatetime; - this.modifyUser =modifyUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; this.fixId = fixId; this.transQty = sumTranQty; } - public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, - String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc, - String createDatetime,String createUser,String modifyUser,String modifyDatetime) { + public WmsMoveMaster(Long id, String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, + String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, String refSrc, + String createDatetime, String createUser, String modifyUser, String modifyDatetime) { this.id = id; this.orderNo = orderNo; this.organizeCode = organizeCode; @@ -212,16 +213,17 @@ public class WmsMoveMaster extends BaseBean { this.fixId = fixId; this.busiTypeCode = busiTypeCode; this.refSrc = refSrc; - this.createDatetime= createDatetime; + this.createDatetime = createDatetime; this.createUser = createUser; - this.modifyUser =modifyUser; - this.modifyDatetime =modifyDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; } - public Double getTransQty(){ + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } - public int getBusiTypeCodeVal(){ + + public int getBusiTypeCodeVal() { return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue(); } } From 9edfa3d481b54b75c0c5be29780370b5b3968cdd Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 18 Oct 2019 09:56:59 +0800 Subject: [PATCH 19/82] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonKnowledgeBase.java | 38 +++++ .../i3plus/pojo/andon/bean/AndonManageQueue.java | 160 +----------------- .../i3plus/pojo/andon/model/BaseManageQueue.java | 180 +++++++++++++++++++++ .../repository/IAndonKnowledgeBaseRepository.java | 16 ++ 4 files changed, 236 insertions(+), 158 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java new file mode 100644 index 0000000..835046b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; +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: Crish + * @CreateDate:2019-10-18-9:13 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_KNOWLEDGE_BASE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON知识库") +public class AndonKnowledgeBase extends BaseManageQueue { + @Column(name = "FLOW_STATUS") + @ApiParam(value = "审批状态") + private Integer flowStatus; + + @Column(name = "FLOW_MEMO") + @ApiParam(value = "审批意见") + private String flowMemo; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index ae634b1..573ca3e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; @@ -40,77 +41,11 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonManageQueue extends BaseBean { - - @Column(name = "ANDON_ORDER_NO") - @ApiParam(value = "安灯队列编号") - private String andonOrderNo; - - @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") - private String alarmCode; - - @Column(name = "ACTION_CODE") - @ApiParam(value = "安灯动作代码") - private String actionCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME_RDD") - @ApiParam(value = "工作中心名称") - private String workCenterNameRdd; - - @Column(name = "WORK_CELL_NAME_RDD") - @ApiParam(value = "工作单元名称") - private String workCellNameRdd; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") - private String workCellCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam(value = "设备代码") - private String equipmentCode; - - @Column(name = "EQUIPMENT_NAME_RDD") - @ApiParam(value = "设备名称") - private String equipmentNameRdd; - - @Column(name = "SHIFT_CODE") - @ApiParam(value = "班次代码") - private String shiftCode; - - @Column(name = "SHIFT_NAME_RDD") - @ApiParam(value = "班次名称") - private String shiftNameRdd; - - @Column(name = "STATUS_CODE") - @ApiParam(value = "安灯状态代码") - private String statusCode; - +public class AndonManageQueue extends BaseManageQueue { @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; - @Column(name = "PRIORITY_LEVEL") - @ApiParam(value = "优先级别", example = "1") - private Integer priorityLevel; - - @Column(name="CALL_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") - @AnnoOutputColumn(hidden = true) - public String callTime; - - @Column(name="CLOSE_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="撤销时间",example = "2018-01-01 01:00:00") - @AnnoOutputColumn(hidden = true) - public String closeTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00") @@ -121,42 +56,14 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value="呼叫时间，查询结束时间", example = "2018-01-01 01:00:00") public String callTimeEnd; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @Column(name="CONFIRM_TIME") - @ApiParam(value = "响应时间", example = "2018-01-01 01:00:00") - @AnnoOutputColumn(hidden = true) - public String confirmTime; - - @Column(name="RESET_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") - @AnnoOutputColumn(hidden = true) - public String resetTime; - - @Column(name = "CALL_USER") - @ApiParam(value = "呼叫人") - private String callUser; - - @Column(name = "CLOSE_USER") - @ApiParam(value = "撤销人") - private String closeUser; - @Transient @ApiParam(value = "呼叫人名字") private String callUserName; - @Column(name = "CONFIRM_USER") - @ApiParam(value = "响应人") - private String confirmUser; - @Transient @ApiParam(value = "响应人名字") private String confirmUserName; - @Column(name = "RESET_USER") - @ApiParam(value = "解决人") - private String resetUser; - @Column(name = "SOURCE_TYPE") @ApiParam(value = "安灯来源类型") private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue(); @@ -187,58 +94,6 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "转呼通知等级") private String scRpLevel; - @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") - private String acCode; - - @Column(name = "AC_NAME_RDD") - @ApiParam(value = "呼叫原因描述") - private String acNameRdd; - - @Column(name = "AC_DESC") - @ApiParam(value = "呼叫具体原因") - private String acDesc; - - @Column(name = "EC_CODE") - @ApiParam(value = "事件原因代码") - private String ecCode; - - @Column(name = "EC_NAME_RDD") - @ApiParam(value = "事件原因描述") - private String ecNameRdd; - - @Column(name = "EC_DESC") - @ApiParam(value = "事件具体原因") - private String ecDesc; - - @Column(name = "EM_CODE") - @ApiParam(value = "事件方法代码") - private String emCode; - - @Column(name = "EM_NAME_RDD") - @ApiParam(value = "事件方法描述") - private String emNameRdd; - - @Column(name = "CLOSE_CAUSE") - @ApiParam(value = "撤销原因") - private String closeCause; - - @Column(name = "EM_DESC") - @ApiParam(value = "事件具体方法") - private String emDesc; - - @Column(name = "IS_HALT") - @ApiParam(value = "是否停机", example = "1") - private Integer isHalt; - - @Column(name = "HALT_CODE") - @ApiParam(value = "停机类型") - private String haltCode; - - @Column(name = "HALT_DESC") - @ApiParam(value = "停机具体原因") - private String haltDesc; - @Transient @ApiParam(value = "异常时长", example = "0") private Long execptionTime; @@ -288,23 +143,12 @@ public class AndonManageQueue extends BaseBean { private String signSendFlag; /** - * 处理类型：10=标准处理，20=自处理 - */ - @Column(name = "DISPOSAL_TYPE") - @ApiParam(value = "处理类型") - private String disposalType; - - /** * 1 = 是，2 = 否 */ @Transient @ApiParam(value = "是否勾选加入自处理问题库", example = "2") private Integer isDisposal; - @Column(name = "ALARM_DETAIL_CODE") - @ApiParam(value = "安灯子类型代码") - private String alarmDetailCode; - @Column(name = "ALARM_DETAIL_NAME_RDD") @ApiParam(value = "安灯子类型名称") private String alarmDetailNameRdd; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java new file mode 100644 index 0000000..5585338 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java @@ -0,0 +1,180 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-18-8:36 + * @Modify: + **/ +@Data +@MappedSuperclass +public class BaseManageQueue extends BaseBean { + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + public String alarmCode; + + @Column(name = "ACTION_CODE") + @ApiParam(value = "安灯动作代码") + public String actionCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + public String workCenterCode; + + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + public String workCenterNameRdd; + + @Column(name = "WORK_CELL_NAME_RDD") + @ApiParam(value = "工作单元名称") + public String workCellNameRdd; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + public String workCellCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam(value = "设备代码") + public String equipmentCode; + + @Column(name = "EQUIPMENT_NAME_RDD") + @ApiParam(value = "设备名称") + public String equipmentNameRdd; + + @Column(name = "SHIFT_CODE") + @ApiParam(value = "班次代码") + public String shiftCode; + + @Column(name = "SHIFT_NAME_RDD") + @ApiParam(value = "班次名称") + public String shiftNameRdd; + + @Column(name = "STATUS_CODE") + @ApiParam(value = "安灯状态代码") + public String statusCode; + + @Column(name = "PRIORITY_LEVEL") + @ApiParam(value = "优先级别", example = "1") + public Integer priorityLevel; + + @Column(name="CALL_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String callTime; + + @Column(name="CLOSE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="撤销时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String closeTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Column(name="CONFIRM_TIME") + @ApiParam(value = "响应时间", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String confirmTime; + + @Column(name="RESET_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String resetTime; + + @Column(name = "CALL_USER") + @ApiParam(value = "呼叫人") + public String callUser; + + @Column(name = "CLOSE_USER") + @ApiParam(value = "撤销人") + public String closeUser; + + @Column(name = "CONFIRM_USER") + @ApiParam(value = "响应人") + public String confirmUser; + + @Column(name = "RESET_USER") + @ApiParam(value = "解决人") + public String resetUser; + + @Column(name = "CLOSE_CAUSE") + @ApiParam(value = "撤销原因") + public String closeCause; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + public String acCode; + + @Column(name = "AC_NAME_RDD") + @ApiParam(value = "呼叫原因描述") + public String acNameRdd; + + @Column(name = "AC_DESC") + @ApiParam(value = "呼叫具体原因") + public String acDesc; + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + public String ecCode; + + @Column(name = "EC_NAME_RDD") + @ApiParam(value = "事件原因描述") + public String ecNameRdd; + + @Column(name = "EC_DESC") + @ApiParam(value = "事件具体原因") + public String ecDesc; + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + public String emCode; + + @Column(name = "EM_NAME_RDD") + @ApiParam(value = "事件方法描述") + public String emNameRdd; + + + @Column(name = "EM_DESC") + @ApiParam(value = "事件具体方法") + public String emDesc; + + @Column(name = "IS_HALT") + @ApiParam(value = "是否停机", example = "1") + public Integer isHalt; + + @Column(name = "HALT_CODE") + @ApiParam(value = "停机类型") + public String haltCode; + + @Column(name = "HALT_DESC") + @ApiParam(value = "停机具体原因") + public String haltDesc; + + /** + * 处理类型：10=标准处理，20=自处理 + */ + @Column(name = "DISPOSAL_TYPE") + @ApiParam(value = "处理类型") + public String disposalType; + + @Column(name = "ALARM_DETAIL_CODE") + @ApiParam(value = "安灯子类型代码") + public String alarmDetailCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java new file mode 100644 index 0000000..2e3036f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: 知识库管理 + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-18-9:16 + * @Modify: + **/ +@Repository +public interface IAndonKnowledgeBaseRepository extends BaseRepository { +} From 9f9874902dd81cddfa4028c14e69884cbba958cf Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 18 Oct 2019 10:21:51 +0800 Subject: [PATCH 20/82] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4426ba9..b6adafd 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 86d7736..3681eb6 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 0798953..39a7704 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f220aa1..f355cca 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 1de89d732be8c9d607c1f7fdbd3c3d8b93a3d537 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 18 Oct 2019 10:37:48 +0800 Subject: [PATCH 21/82] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AF=AF=E6=8B=89?= =?UTF-8?q?=E4=BA=86test=E4=BB=A3=E7=A0=81=EF=BC=8C=E8=A7=A3=E5=86=B3pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b6adafd..4426ba9 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3681eb6..86d7736 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39a7704..0798953 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f355cca..f220aa1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 2dc63a9a4e0b0e62d0ac9b643c47be2fb0d70ec5 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Oct 2019 11:15:20 +0800 Subject: [PATCH 22/82] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=9C=A8=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=202=EF=BC=9A=E4=B8=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/FieldAnnotation.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 4 ++ .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 14 +++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 63 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 2 + .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 3 ++ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 4 +- .../pojo/aps/enums/RESOURCE_CHOISE_RULE.java | 4 ++ .../i3plus/pojo/aps/enums/WORK_SORT_RULE.java | 31 +++++++++++ .../i3plus/pojo/aps/holders/EResCalendar.java | 2 + .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 19 +++---- .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 7 +++ .../pojo/aps/repository/IWorkPlanRepository.java | 9 ++++ .../src/main/resources/relations/ResCalendar.xml | 4 ++ .../src/main/resources/relations/WorkInput.xml | 12 ++--- .../src/main/resources/relations/WorkPlan.xml | 9 ++++ 18 files changed, 179 insertions(+), 17 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index a8484af..6a0a0d2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -20,4 +20,5 @@ public @interface FieldAnnotation { boolean display() default true; // 是否需要在界面显示 int pric() default 2; // 对于浮点型，界面显示的精度 boolean mainkey() default false; // 是否为主键 + String defaultValue() default ""; // 字段的默认值 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 817df4a..be169d1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -80,6 +80,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="数据库类型") private JDBCType jdbcType; + @Column(name="DEFAULT_VALUE") + @ApiParam(value ="字段默认值") + private String defaultValue; + @JsonIgnore private transient Class clazz; @JsonIgnore 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 4483e7e..46880ed 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; @@ -31,10 +32,12 @@ import java.util.List; public class Material extends BaseCode { @Column(name="TYPE") @ApiParam(value ="类型") + @FieldAnnotation(defaultValue = "PRODUCT") private MATERIAL_TYPE type; @Column(name="PREPARE_TYPE") @ApiParam(value ="备料类型") + @FieldAnnotation(defaultValue = "SELF_MAKE") private PREPARE_TYPE prepareType; @Column(name="REPL_TYPE") @@ -68,10 +71,12 @@ public class Material extends BaseCode { @Column(name="LEVEL") @ApiParam(value ="低阶码") @RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel") + @FieldAnnotation(modify = false) private Integer level; @Column(name="IS_AUTO_FIX_PEGGING") @ApiParam(value ="自动补充标识") + @FieldAnnotation(defaultValue = "true") private Boolean autoFixPegging; @Column(name="MAX_PRODUCT_BATCH") @@ -80,6 +85,7 @@ public class Material extends BaseCode { @Column(name="MIN_PRODUCT_BATCH") @ApiParam(value ="最小制造批量") + @FieldAnnotation(defaultValue = "0.0") private Double minProductBatch; @Column(name="UNIT_PRODUCT_BATCH") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index 7edd19f..2ec0cbc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EResCalendar; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -8,6 +11,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :日历 @@ -40,4 +44,14 @@ public class ResCalendar extends BaseAPS { @Column(name="PRIORITY") @ApiParam(value ="优先级") private Integer priority; + + @JsonBackReference + public List getDayShifts() { + return BeanRelation.list(this, EResCalendar.DayShifts); + } + + @JsonBackReference + public List getResources() { + return BeanRelation.list(this, EResCalendar.Resources); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index a9992f3..896eb83 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -184,4 +184,6 @@ public class Work extends BaseCode { public List getPlanFeedbacks() { return BeanRelation.list(this, EWork.PlanFeedbacks); } + + public WorkPlan getWorkPlan() { return BeanRelation.get(this, EWork.WorkPlan); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java new file mode 100644 index 0000000..546b590 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; +import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description :工作计划 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="APS_WORK_PLAN") +@Api("工作计划") +public class WorkPlan extends BaseAPS { + private Date prevSetStart; + private Date prevSetEnd; + private String prevSetTime; + private Date produceStart; + private Date produceEnd; + private String produceTime; + private Date postSetStart; + private Date postSetEnd; + private String postSetTime; + private Date lockStart; + private Date lockEnd; + private String lockTime; + + private Date edgeTime; + + private Long workId; + private Long resourceId; + + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkPlan.Work, work); + } + + public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); } + + public void setResource(Resource resource) { + this.resourceId = resource != null ? resource.getId() : 0l; + BeanRelation.set(this, EWorkPlan.Resource, resource); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 8b1c8f9..e61ce60 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.common; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import javax.persistence.MappedSuperclass; @@ -18,6 +19,7 @@ import java.util.Map; @Data @MappedSuperclass public abstract class BaseAPS extends BaseBean { + @JsonIgnore private transient Map customFields = new HashMap<>(); public Object getCustomField(String code) { 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 de0cb5f..4c43a95 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 @@ -287,6 +287,9 @@ public class BeanInfo { case STRING: cls = String.class; break; + case DURATION: + cls = DateDuration.class; + break; default: break; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 1eaa05e..6c7e206 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -217,7 +217,7 @@ public class BeanRelation { * @param bean * @param holder */ - private static void remove(BaseBean bean, Enum holder) { + public static void remove(BaseBean bean, Enum holder) { if (bean == null || holder == null) { return; } @@ -241,7 +241,7 @@ public class BeanRelation { * @param holder * @param relaBean */ - private static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { + public static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { if (bean == null || holder == null) { return; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java new file mode 100644 index 0000000..864cf3e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java @@ -0,0 +1,4 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum RESOURCE_CHOISE_RULE { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java new file mode 100644 index 0000000..4984c67 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :预置的工作排序规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public enum WORK_SORT_RULE { + NONE, + ORDER_DELIVERY, // 订单交货期 + ORDER_PRIORITY, // 订单优先级 + ORDER_ESTSTART, // 订单最早开始时刻 + ORDER_COUNT, // 订单数量 + ORDER_RECEIVE_DATE,// 订单接单日期 + ORDER_LET_MINUS_EST,// 订单交货期与订单最早开始时刻之差 + ORDER_PRESSURE, // 订单紧迫程度 + ORDER_SURPLUS, // 订单余裕度 + REMAIN_OPERATION_COUNT,// 残留工序数 + REMAIN_PRODUCT, // 残留生产时间 + MINSTE_PREMAIN,// 最小工序宽裕时间 + WORK_LET, // 工作最晚结束时刻 + WORK_EST, // 工作最早开始时刻 + ORDER_STOCK_RELA, // 订单物品库存量相对值 + ORDER_FIRST_WORK_START,// 订单首工作上次开始时刻 + HAVE_HIGH_WORK, // 订单中含有高级别工作 + WORK_RESOURCE_COUNT, // 工作的可用资源数 + WORK_SCHED_APPROX,// 与已排工作近视度 + TOP_ORDER_DELIVERY;// 顶层订单的交货期 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java index 86fd054..1717230 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java @@ -1,4 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResCalendar { + DayShifts, + Resources } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 13dee44..47da0e1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -1,13 +1,14 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EWork { - Order, - ParentWork, - WorkResources, - WorkInputs, - WorkOutputs, - PrevRelations, - PostRelations, - Operation, - PlanFeedbacks + Order, // 订单 + ParentWork, // 父工作 + WorkResources, // 工作资源 + WorkInputs, // 工作输入 + WorkOutputs, // 工作输出 + PrevRelations, // 前关联 + PostRelations, // 后关联 + Operation, // 工序 + PlanFeedbacks, // 工作计划反馈 + WorkPlan // 关联的为主资源的计划 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java new file mode 100644 index 0000000..f288a42 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EWorkPlan { + Work, + Resource, + AssPlans // 关联的为副资源的工作计划 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java new file mode 100644 index 0000000..a843876 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.WorkPlan; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface IWorkPlanRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml index d35accc..d2d6643 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml @@ -1,3 +1,7 @@ + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml index c1f7586..369d560 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml @@ -1,9 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml new file mode 100644 index 0000000..219bf07 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file From 1d3fc8b5c9a929de79152e7be88281aa9268ed6a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 18 Oct 2019 17:17:52 +0800 Subject: [PATCH 23/82] =?UTF-8?q?mes=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java | 1 - .../{MesWorkOrderButtonModel.java => MesButtonFlagModel.java} | 7 +++++-- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java | 3 +++ 4 files changed, 10 insertions(+), 5 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesWorkOrderButtonModel.java => MesButtonFlagModel.java} (85%) 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 8edb6bf..a5e62dc 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 @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; +import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean { @Transient @ApiParam("mes生产工单页面按钮控制") - private MesWorkOrderButtonModel workOrderButtonModel; + private MesButtonFlagModel workOrderButtonModel; @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 df1dcb6..67a37dc 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java similarity index 85% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index 4a5af7e..1928952 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -17,8 +17,8 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -@Api("mes生产工单页面按钮控制model") -public class MesWorkOrderButtonModel implements Serializable { +@Api("mes页面按钮控制model") +public class MesButtonFlagModel implements Serializable { @ApiParam("修改按钮") private boolean updateButton; @@ -47,5 +47,8 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("完成按钮") private boolean completeButton; + @ApiParam("关闭按钮-提醒") + private boolean closeButtonNoticeFlag; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java index 71f9cea..b1bb02b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java @@ -70,6 +70,9 @@ public class MesEquTaskModel implements Serializable { @ApiParam("通知标识") private String notifyFlagName; + @ApiParam("mes设备作业任务页面按钮控制") + private MesButtonFlagModel equTaskButtonFlagModel; + public MesEquTaskModel() { From 5a682467d1deefa3ecb6a3f830c2bf207d872eeb Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Oct 2019 17:37:15 +0800 Subject: [PATCH 24/82] =?UTF-8?q?1=EF=BC=9A=E5=9C=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A8=E4=B8=AD=E6=96=B0=E5=A2=9E=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E9=A1=B9=E6=95=B0=E7=BB=84=EF=BC=8C=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=9C=A8=E9=80=89=E6=8B=A9=E6=9E=9A=E4=B8=BE=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E4=BB=8E=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=8E=B7=E5=8F=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 5 ++++- .../estsh/i3plus/pojo/aps/bean/OperResource.java | 4 ++++ .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 4 ++++ .../pojo/aps/enums/RESOURCE_CHOISE_RULE.java | 18 +++++++++++++++++ .../i3plus/pojo/aps/enums/WORK_SORT_RULE.java | 23 +++++++++++----------- 5 files changed, 42 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index be169d1..f302131 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -41,7 +41,7 @@ public class FieldInfo extends BaseCode { private FIELD_TYPE type; @Column(name="TYPE_NAME") - @ApiParam(value ="类型全称") + @ApiParam(value ="类型名称") private String typeName; @Column(name="CUSTOMIZE") @@ -84,6 +84,9 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="字段默认值") private String defaultValue; + @ApiParam(value ="枚举项内容") + private transient Enum[] enumItems; + @JsonIgnore private transient Class clazz; @JsonIgnore 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 b56b850..4957a0e 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 @@ -59,6 +59,10 @@ public class OperResource extends BaseAPS { @ApiParam(value ="优先级") private Integer priority; + @Column(name="USER_MATCH_NUMBER") + @ApiParam(value ="资源使用配套号") + private String userMatchNumber; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 2e9b10d..d500003 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -58,6 +58,10 @@ public class WorkResource extends BaseAPS { @ApiParam(value ="最大后设置中断时间") private String maxPostSdTime; + @Column(name="USER_MATCH_NUMBER") + @ApiParam(value ="资源使用配套号") + private String userMatchNumber; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java index 864cf3e..deb2079 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java @@ -1,4 +1,22 @@ package cn.estsh.i3plus.pojo.aps.enums; +/** + * @Description :预置的资源选择规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public enum RESOURCE_CHOISE_RULE { + PREV_SET_TIME, // 前设置时间 + PRODUCE_TIME, // 生产时间 + POST_SET_TIME, // 后设置时间 + WORK_WAIT_TIME, // 工作等待时间 + RES_BALANCE, // 资源均衡度 + SAME_MATERIAL, // 相同物料 + SAME_ORDER, // 相同订单 + NEARLY_WORK, // 前后工作 + POST_RESOURCE, // 后资源制约 + SAME_ASS_RESOURCE, // 相同副资源 + RESOURCE_PRIORITY; // 资源优先级 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java index 4984c67..99a6d77 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java @@ -9,23 +9,24 @@ package cn.estsh.i3plus.pojo.aps.enums; **/ public enum WORK_SORT_RULE { NONE, - ORDER_DELIVERY, // 订单交货期 + ORDER_LET, // 订单交货期 ORDER_PRIORITY, // 订单优先级 - ORDER_ESTSTART, // 订单最早开始时刻 + ORDER_EST, // 订单最早开始时刻 ORDER_COUNT, // 订单数量 ORDER_RECEIVE_DATE,// 订单接单日期 - ORDER_LET_MINUS_EST,// 订单交货期与订单最早开始时刻之差 + ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差 ORDER_PRESSURE, // 订单紧迫程度 ORDER_SURPLUS, // 订单余裕度 - REMAIN_OPERATION_COUNT,// 残留工序数 - REMAIN_PRODUCT, // 残留生产时间 - MINSTE_PREMAIN,// 最小工序宽裕时间 + NOPLAN_OPERATION_SIZE,// 残留工序数 + REMAIN_PRODUCE_TIME, // 残留生产时间 + MIN_OPERATION_REMAIN_TIME,// 最小工序宽裕时间 WORK_LET, // 工作最晚结束时刻 WORK_EST, // 工作最早开始时刻 - ORDER_STOCK_RELA, // 订单物品库存量相对值 - ORDER_FIRST_WORK_START,// 订单首工作上次开始时刻 + INVENTORY_RELA, // 订单物品库存量相对值 + FIRST_WORK_BEGIN,// 订单首工作上次开始时刻 HAVE_HIGH_WORK, // 订单中含有高级别工作 - WORK_RESOURCE_COUNT, // 工作的可用资源数 - WORK_SCHED_APPROX,// 与已排工作近视度 - TOP_ORDER_DELIVERY;// 顶层订单的交货期 + WORK_RESOURCE_SIZE, // 工作的可用资源数 + TOP_ORDER_LET,// 顶层订单的交货期 + TOP_ORDER_CODE, // 顶层订单代码 + TOP_ORDER_PRIORITY; // 顶层订单优先级 } From a1597c089c327fce23f1124d4871fde60207abc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 18 Oct 2019 18:21:45 +0800 Subject: [PATCH 25/82] =?UTF-8?q?=E6=88=90=E5=93=81=E5=86=B2=E9=94=80+?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=BD=AC=E6=8D=A2=E6=A0=BC=E5=BC=8F=EF=BC=88?= =?UTF-8?q?=E5=B0=B1=E4=B8=80=E4=B8=AA=E4=B8=8D=E7=9F=A5=E9=81=93=E6=98=AF?= =?UTF-8?q?=E4=BB=80=E4=B9=88=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java index a72ed67..bc8af3b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java @@ -1,10 +1,10 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; import lombok.Data; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description 冲销Model @@ -18,5 +18,5 @@ public class WmsWriteOffModel implements Serializable { private static final long serialVersionUID = -5490167040159056107L; private String locateNo; private List snList; - private List> summaryList; + private List summaryList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 4ea1543..f4fdad9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -186,7 +186,7 @@ public class WmsMoveSn extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; + public Integer lockVersion; @Transient @ApiParam(value = "快照时间") @@ -202,10 +202,12 @@ public class WmsMoveSn extends BaseBean { public WmsMoveSn() { } - public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) { + public WmsMoveSn(String partNo, String partNameRdd, String unit, String lotNo, Double qty) { this.partNo = partNo; - this.waitingCounts = waitingCounts; - this.finishedCounts = finishedCounts; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.lotNo = lotNo; + this.qty = qty; } public Long getWaitingCounts() { @@ -216,6 +218,12 @@ public class WmsMoveSn extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } + public WmsMoveSn(String partNo, String lotNo, Double qty) { + this.partNo = partNo; + this.lotNo = lotNo; + this.qty = qty; + } + public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; From f6be80db0173dbed668bc7a5e66185303b05d77a Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Sat, 19 Oct 2019 17:41:25 +0800 Subject: [PATCH 26/82] =?UTF-8?q?=E5=A2=9E=E5=8A=A0groupby=20=E6=9E=84?= =?UTF-8?q?=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 13 ++++++++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 8 ++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) 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 9722217..a1832ae 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 @@ -149,12 +149,23 @@ public class WmsCSFactTrans extends BaseBean { this.srcZoneNo = srcZoneNo; this.srcWhNo = srcWhNo; } - + public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) { + this.partNo=partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.qty=qty; + } public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) { this.countBoxQty = countBoxQty; this.sumPartQty = sumPartQty; this.zoneNo = zoneNo; this.partNo = partNo; this.partNameRdd = partNameRdd; + } + + + } 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 6461ae8..5addb05 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 @@ -178,4 +178,12 @@ public class WmsCSOrderDetails extends BaseBean { this.organizeCode = organizeCode; this.transStatus = transStatus; } + public WmsCSOrderDetails(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) { + this.partNo=partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.qty=qty; + } } From 0fdabe49507df48e0c6cb957537927466d522e13 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 19 Oct 2019 19:36:43 +0800 Subject: [PATCH 27/82] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=20=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=A4=84=E7=90=86=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonDisposalCfg.java | 10 +++- .../pojo/andon/bean/AndonDisposalMaintenCfg.java | 65 ++++++++++++++++++++++ .../IAndonDisposalMaintenCfgRepository.java | 14 +++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 44 +++++++++++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 47 ++++++++++++++++ 5 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 26d333c..96463f0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -51,8 +51,12 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acNameRdd; - @AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description") - @Column(name = "APPROVAL_STATUS") + @AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description") + @Column(name = "FLOW_STATUS") @ApiParam(value = "审批状态") - private String approvalStatus; + private Integer flowStatus; + + @Column(name = "FLOW_MEMO") + @ApiParam(value = "审批意见") + private String flowMemo; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java new file mode 100644 index 0000000..a0b4eed --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.BaseModelBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +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: Crish + * @CreateDate:2019-10-19-14:56 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_DISPOSAL_MAINTEN_CFG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("Andon自处理维护配置") +public class AndonDisposalMaintenCfg extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "EM_CODE") + @ApiParam(value = "处理措施代码") + private String emCode; + + @Column(name = "RP_WHERE") + @ApiParam(value = "有效时长") + private Integer rpWhere; + + @Column(name = "FAIL_TIME") + @ApiParam(value = "失败次数") + private Integer failTime; + + @Column(name = "SUCCESS_TIME") + @ApiParam(value = "成功次数") + private Integer successTime; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java new file mode 100644 index 0000000..53bb9fd --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description: 自处理维护配置 + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-19-15:02 + * @Modify: + **/ +public interface IAndonDisposalMaintenCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 044f313..f46add5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -113,6 +113,23 @@ public class AndonHqlPack { } /** + * 自处理维护配置 + * @param andonDisposalMaintenCfg + * @return + */ + public static DdlPackBean getAndonDisposalMaintenCfg(AndonDisposalMaintenCfg andonDisposalMaintenCfg) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getEmCode(), "emCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAcCode(), "acCode", packBean); + DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean); + return packBean; + } + + /** * 安灯附属表 * @param andonQueueAttach * @return @@ -306,6 +323,32 @@ public class AndonHqlPack { } /** + * 按条件查询安灯知识库 + * @param andonKnowledgeBase + * @return + */ + public static DdlPackBean packAndonKnowlegeBase(AndonKnowledgeBase andonKnowledgeBase){ + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getNumEqualPack(andonKnowledgeBase.getFlowStatus(), "flowStatus", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAcCode(), "acCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean); + + if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){ + DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true); + } + + getStringBuilderPack(andonKnowledgeBase, packBean); + packBean.setOrderByStr(andonKnowledgeBase.orderBy()); + return packBean; + } + + /** * 按条件查询按灯队列信息 * @param andonManageQueue * @return @@ -350,6 +393,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result); + DdlPreparedPack.getNumEqualPack(andonDisposalCfg.getFlowStatus(),"flowStatus", result); getStringBuilderPack(andonDisposalCfg, result); return result; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index ce28bb4..230f235 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -12,6 +12,53 @@ import org.apache.commons.lang3.StringUtils; **/ public class AndonEnumUtil { /** + * 按灯状态 + * 10-是，20-否 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum KNOWLEDGE_AUDIT_STATUS { + PENDING(10,"待审批"), + PASS(20,"审批通过"), + STOP(99,"审批不通过"); + + private int value; + private String description; + + KNOWLEDGE_AUDIT_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; + } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 语音播报类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 63e225026cefec0b8d6afcfd02703f0ee4f8d625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 21 Oct 2019 10:08:39 +0800 Subject: [PATCH 28/82] =?UTF-8?q?1.=20=E6=89=A9=E5=B1=95=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=B8=8E=E8=BD=AF=E9=80=82=E9=85=8D=E7=9A=84=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 0abcde9..ac86f7e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -126,7 +126,7 @@ public class WmsInterfaceDataMapper extends BaseBean { * 扩展脚本编号，用于扩展接口功能 */ @Column(name = "SCRIPT_NO") - public String ScriptNo; + public String scriptNo; /** * 调用脚本方法获取数据 From 69e8357c69fb74c0b8dc4d955e7c9556261389d8 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Mon, 21 Oct 2019 10:48:19 +0800 Subject: [PATCH 29/82] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/FindWriteModel.java | 11 ++++++++ .../i3plus/pojo/wms/modelbean/SnDifferModel.java | 30 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java new file mode 100644 index 0000000..4371202 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +@Data +public class FindWriteModel { + private List snList; + private String organizeCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java new file mode 100644 index 0000000..04f7e69 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("盘点条码差异返回Model") +public class SnDifferModel { + + //盘点单号 + private String orderNo; + //条码 + private String sn; + //源库位编码 + private String locateNo; + //物料代码 + private String partNo; + //物料名称 + private String partNameRdd; + //应盘数量 + private String qty; + //实盘数量 + private String factQty; + // + private String whNo; + //仓库编码 + private String zoneNo ; + //差异状态 + private String wmStatus; +} From 8a517bc0b986bf9669072223c01e1ffb9b236d31 Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 21 Oct 2019 15:55:23 +0800 Subject: [PATCH 30/82] =?UTF-8?q?=E8=BF=94=E5=8E=82=E8=BF=94=E4=BF=AE?= =?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 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 205 ++++++++++++++++++++- .../i3plus/pojo/mes/pcn/bean/MesProcessBom.java | 6 +- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 8 + .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 4 + .../i3plus/pojo/mes/pcn/model/MesPartBomModel.java | 36 ++++ .../estsh/i3plus/pojo/mes/bean/MesProcessBom.java | 4 + .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 8 + .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 4 + 8 files changed, 270 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java 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 1391a5d..2014c70 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,13 +13,205 @@ public class MesEnumUtil { /** - * mes 操作类型 + * mes 工位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_IS_REPEAT { + + REPEATABLE(1, "可重复"), + NOT_REPEAT(2, "不可重复"); + + private int value; + private String description; + + MES_IS_REPEAT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_IS_REPEAT getByValue(int value) { + for (MES_IS_REPEAT mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes 工位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_TYPE { + + NORMAL(1, "正常"), + REWORK(2, "返修"); + + private int value; + private String description; + + MES_WORK_CELL_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_WORK_CELL_TYPE getByValue(int value) { + for (MES_WORK_CELL_TYPE mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + 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; + } + + } + + /** + * pcn 动作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_ACTION_TYPE { + + BIND(1, "绑定"), + UNTYING(2, "解绑"); + + private int value; + private String description; + + MES_ACTION_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_ACTION_TYPE getByValue(int value) { + for (MES_ACTION_TYPE mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + 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; + } + + } + + /** + * pcn 是否是关键件 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_IS_KEY { + + IS_KEY(1, "是"), + NO_KEY(2, "否"); + + private int value; + private String description; + + MES_IS_KEY(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_IS_KEY getByValue(int value) { + for (MES_IS_KEY mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes 维修状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_REPAIR_STATUS { REPAIRED(1, "已维修"), - NO_REPAIR(2, "未维修"); + NO_REPAIR(2, "待维修"); private int value; private String description; @@ -66,7 +258,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_OPERATE_TYPE { - MES_QUALITY_JUDGEMENT(10, "质量判定"); + WORKSTATION_SCAN(1, "工位扫描"), + QUALITY_JUDGEMENT(2, "质量判定"), + MATERIAL_DISMANTLING(3, "物料拆解"), + REWORK(4, "返修作业"), + WORKSTATION_MONITORING(5, "工位监控"); private int value; private String description; @@ -791,7 +987,8 @@ public class MesEnumUtil { PASS(1, "合格"), FAIL(2, "不合格"), - SCRAP(3, "报废"); + SCRAP(3, "报废"), + DISMANTLED(4, "已拆解"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index 1a26eff..9dfa3d0 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -68,7 +68,7 @@ public class MesProcessBom extends BaseBean { private Double qty; @Column(name = "IS_REPEAT") - @ApiParam(value = "是否可重复") + @ApiParam(value = "是否可重复") private Integer isRepeat; @Column(name = "IS_CHECK") @@ -83,6 +83,10 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否绑定关键件") private Integer isBindKey; + @Column(name = "IS_KEY") + @ApiParam(value = "是否关键件") + private Integer isKey; + @Transient @ApiParam("是否已绑定") private Boolean isBind; 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 9cb5b70..d708cb3 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 @@ -85,6 +85,14 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "结果") private String result; + @Column(name = "IS_KEY") + @ApiParam(value = "是否关键件") + private String isKey; + + @Column(name = "ACTION_TYPE") + @ApiParam(value = "动作类型") + private Integer actionType; + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; } 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 68c7a7a..753c9cb 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 @@ -42,4 +42,8 @@ public class MesWorkCell extends BaseBean { @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; + + @Column(name = "WORK_CELL_TYPE") + @ApiParam("工位类型") + private String workCellType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java new file mode 100644 index 0000000..0f0fccd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\18 19:15 + * @Modify: + **/ +@Data +@Api("mes 物料BOM") +public class MesPartBomModel { + + @ApiParam("物料编号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("数量") + private Integer qty; + + public MesPartBomModel() { + + } + + public MesPartBomModel(String partNo, String partName, Integer qty) { + this.partNo = partNo; + this.partName = partName; + this.qty = qty; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index a01c774..c89db3f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -87,6 +87,10 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否绑定关键件") private Integer isBindKey; + @Column(name = "IS_KEY") + @ApiParam(value = "是否关键件") + private Integer isKey; + @Transient @ApiParam("是否已绑定") private Boolean isBind; 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 6f31b49..3d5b323 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 @@ -86,6 +86,14 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "结果") private String result; + @Column(name = "IS_KEY") + @ApiParam(value = "是否关键件") + private String isKey; + + @Column(name = "ACTION_TYPE") + @ApiParam(value = "动作类型") + private String actionType; + 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/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 9969c7c..785ee0a 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 @@ -47,6 +47,10 @@ public class MesWorkCell extends BaseBean { @ApiParam("生产区域代码") private String areaCode; + @Column(name = "WORK_CELL_TYPE") + @ApiParam("工位类型") + private String workCellType; + @Transient @ApiParam(value ="子集列表") private List childTreeList; From 7139d9b5f11fc732b1d7db61fe8d2eb153baf541 Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 21 Oct 2019 16:05:05 +0800 Subject: [PATCH 31/82] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 118 +-------------------- 1 file changed, 3 insertions(+), 115 deletions(-) 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 51f3f5b..2014c70 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,7 +13,6 @@ public class MesEnumUtil { /** -<<<<<<< HEAD * mes 工位类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -21,25 +20,11 @@ public class MesEnumUtil { REPEATABLE(1, "可重复"), NOT_REPEAT(2, "不可重复"); -======= - * mes设备作业任务明细-执行状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_DETAIL_ACTION_STATUS { - - PENDING(10, "待处理"), - COMPLETE(20, "已完成"), - CANCEL(30, "取消"); ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 private int value; private String description; -<<<<<<< HEAD MES_IS_REPEAT(int value, String description) { -======= - MES_EQU_TASK_DETAIL_ACTION_STATUS(int value, String description) { ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 this.value = value; this.description = description; } @@ -52,7 +37,6 @@ public class MesEnumUtil { return description; } -<<<<<<< HEAD // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_REPEAT getByValue(int value) { for (MES_IS_REPEAT mesInsertExcel : values()) { @@ -64,8 +48,6 @@ public class MesEnumUtil { } -======= ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -79,7 +61,6 @@ public class MesEnumUtil { } /** -<<<<<<< HEAD * mes 工位类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -87,24 +68,11 @@ public class MesEnumUtil { NORMAL(1, "正常"), REWORK(2, "返修"); -======= - * mes设备作业任务明细-整体结果 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_DETAIL_FINAL_RESULT { - - YES(10, "合格"), - NO(20, "不合格"); ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 private int value; private String description; -<<<<<<< HEAD MES_WORK_CELL_TYPE(int value, String description) { -======= - MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) { ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 this.value = value; this.description = description; } @@ -117,7 +85,6 @@ public class MesEnumUtil { return description; } -<<<<<<< HEAD // 根据value返回枚举类型,主要在switch中使用 public static MES_WORK_CELL_TYPE getByValue(int value) { for (MES_WORK_CELL_TYPE mesInsertExcel : values()) { @@ -129,8 +96,6 @@ public class MesEnumUtil { } -======= ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -144,7 +109,6 @@ public class MesEnumUtil { } /** -<<<<<<< HEAD * pcn 动作类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -152,24 +116,11 @@ public class MesEnumUtil { BIND(1, "绑定"), UNTYING(2, "解绑"); -======= - * mes设备作业任务明细-维修标识 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG { - - FALSE(10, "否"), - TRUE(20, "是"); ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 private int value; private String description; -<<<<<<< HEAD MES_ACTION_TYPE(int value, String description) { -======= - MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) { ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 this.value = value; this.description = description; } @@ -182,7 +133,6 @@ public class MesEnumUtil { return description; } -<<<<<<< HEAD // 根据value返回枚举类型,主要在switch中使用 public static MES_ACTION_TYPE getByValue(int value) { for (MES_ACTION_TYPE mesInsertExcel : values()) { @@ -194,8 +144,6 @@ public class MesEnumUtil { } -======= ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -209,7 +157,6 @@ public class MesEnumUtil { } /** -<<<<<<< HEAD * pcn 是否是关键件 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -217,27 +164,11 @@ public class MesEnumUtil { IS_KEY(1, "是"), NO_KEY(2, "否"); -======= - * mes设备作业状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_STATUS { - - CREATE(10, "创建"), - LANDED(20, "下达"), - OPEN(30, "开启"), - CLOSE(40, "关闭"), - CANCEL(50, "取消"); ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 private int value; private String description; -<<<<<<< HEAD MES_IS_KEY(int value, String description) { -======= - MES_EQU_TASK_STATUS(int value, String description) { ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 this.value = value; this.description = description; } @@ -250,7 +181,6 @@ public class MesEnumUtil { return description; } -<<<<<<< HEAD // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_KEY getByValue(int value) { for (MES_IS_KEY mesInsertExcel : values()) { @@ -262,8 +192,6 @@ public class MesEnumUtil { } -======= ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -277,7 +205,6 @@ public class MesEnumUtil { } /** -<<<<<<< HEAD * mes 维修状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -285,25 +212,11 @@ public class MesEnumUtil { REPAIRED(1, "已维修"), NO_REPAIR(2, "待维修"); -======= - * mes设备作业任务来源 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_SOURCE { - - PLAN(10, "周期计划"), - CREATE(20, "手工创建"), - ANDON(30, "ANDON"); ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 private int value; private String description; -<<<<<<< HEAD MES_REPAIR_STATUS(int value, String description) { -======= - MES_EQU_TASK_SOURCE(int value, String description) { ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 this.value = value; this.description = description; } @@ -316,7 +229,6 @@ public class MesEnumUtil { return description; } -<<<<<<< HEAD // 根据value返回枚举类型,主要在switch中使用 public static MES_REPAIR_STATUS getByValue(int value) { for (MES_REPAIR_STATUS mesInsertExcel : values()) { @@ -328,8 +240,6 @@ public class MesEnumUtil { } -======= ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -343,7 +253,6 @@ public class MesEnumUtil { } /** -<<<<<<< HEAD * mes 操作类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -354,24 +263,11 @@ public class MesEnumUtil { MATERIAL_DISMANTLING(3, "物料拆解"), REWORK(4, "返修作业"), WORKSTATION_MONITORING(5, "工位监控"); -======= - * mes设备作业通知标识 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_NOTIFY_FLAG { - - FALSE(10, "未通知"), - TRUE(20, "已通知"); ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 private int value; private String description; -<<<<<<< HEAD MES_OPERATE_TYPE(int value, String description) { -======= - MES_EQU_TASK_NOTIFY_FLAG(int value, String description) { ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 this.value = value; this.description = description; } @@ -384,7 +280,6 @@ public class MesEnumUtil { return description; } -<<<<<<< HEAD // 根据value返回枚举类型,主要在switch中使用 public static MES_OPERATE_TYPE getByValue(int value) { for (MES_OPERATE_TYPE mesInsertExcel : values()) { @@ -396,8 +291,6 @@ public class MesEnumUtil { } -======= ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -411,11 +304,7 @@ public class MesEnumUtil { } /** -<<<<<<< HEAD * mes设备作业要求-作业类型 -======= - * mes导入模块 ->>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_INSERT_EXCEL { @@ -464,10 +353,10 @@ public class MesEnumUtil { } /** - * mes设备-作业类型 + * mes设备作业要求-作业类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_TYPE { + public enum MES_EQU_TASK_STANDARD_TASK_TYPE { CHECK(10, "点检"), MAINTAIN(20, "保养"), @@ -476,7 +365,7 @@ public class MesEnumUtil { private int value; private String description; - MES_EQU_TASK_TYPE(int value, String description) { + MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -1646,7 +1535,6 @@ public class MesEnumUtil { CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), - RUNNING_INFO("runningInfo", "运行信息"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); From 2da78c32373c1c4ba7f48ea9dbd8a90b589088f8 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 21 Oct 2019 16:06:59 +0800 Subject: [PATCH 32/82] =?UTF-8?q?idea=20=E5=BC=82=E5=B8=B8=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=A0=BC=E5=BC=8F=E5=8C=96=20+=20=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=B7=A5=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 6 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java | 14 ++-- .../estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java | 14 ++-- .../i3plus/pojo/mes/pcn/bean/MesCustProdLine.java | 6 +- .../i3plus/pojo/mes/pcn/bean/MesCustomer.java | 14 ++-- .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 8 +- .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 16 ++-- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java | 32 +++---- .../i3plus/pojo/mes/pcn/bean/MesEquipment.java | 32 +++---- .../estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java | 8 +- .../estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java | 14 ++-- .../i3plus/pojo/mes/pcn/bean/MesKpsnRule.java | 24 +++--- .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 20 ++--- .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 22 ++--- .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 10 ++- .../i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 16 ++-- .../i3plus/pojo/mes/pcn/bean/MesPackSpec.java | 97 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 92 ++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 59 +++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 55 ++++++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 26 +++--- .../i3plus/pojo/mes/pcn/bean/MesPartCategory.java | 8 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 20 ++--- .../i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java | 14 ++-- .../i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java | 32 +++---- .../pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 12 +-- .../pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 12 +-- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 28 +++---- .../i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java | 10 +-- .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 44 +++++----- .../estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java | 8 +- .../i3plus/pojo/mes/pcn/bean/MesProdPack.java | 63 ++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 46 +++++----- .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 54 ++++++------ .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 2 +- .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 22 ++--- .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 8 +- .../estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java | 6 +- .../estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 12 +-- .../i3plus/pojo/mes/pcn/bean/MesShiftGroup.java | 6 +- .../i3plus/pojo/mes/pcn/bean/MesShiftRest.java | 10 +-- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 34 ++++---- .../estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java | 12 +-- .../i3plus/pojo/mes/pcn/bean/MesWcEquipment.java | 6 +- .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesWorkCenter.java | 4 +- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 76 ++++++++--------- .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 76 ++++++++--------- .../pojo/mes/pcn/model/GenSerialNoModel.java | 4 +- .../pojo/mes/pcn/model/PlcCacheKeyModel.java | 2 +- .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 1 + .../pojo/mes/pcn/model/StationResultBean.java | 4 +- .../pojo/mes/pcn/model/StepPrintSnModel.java | 10 ++- .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 2 +- .../pcn/repository/MesDataObjectRepository.java | 2 +- .../pcn/repository/MesDatasourceRepository.java | 2 +- .../MesLabelTemplateParamRepository.java | 8 +- .../pcn/repository/MesLabelTemplateRepository.java | 8 +- .../mes/pcn/repository/MesPackSpecRepository.java | 16 ++++ .../pcn/repository/MesPackageDetailRepository.java | 14 ++++ .../mes/pcn/repository/MesPackageRepository.java | 13 +++ .../pcn/repository/MesPackageTravelRepository.java | 13 +++ .../mes/pcn/repository/MesProdPackRepository.java | 16 ++++ .../repository/MesProduceSnTravelRepository.java | 12 +-- .../pcn/repository/MesWcEquipmentRepository.java | 2 +- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 4 +- .../cn/estsh/i3plus/pojo/mes/bean/MesAction.java | 8 +- .../i3plus/pojo/mes/bean/MesActionMethod.java | 8 +- .../cn/estsh/i3plus/pojo/mes/bean/MesArea.java | 12 +-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 10 +-- .../i3plus/pojo/mes/bean/MesButtonStatus.java | 16 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesConfig.java | 14 ++-- .../i3plus/pojo/mes/bean/MesCustProdLine.java | 6 +- .../cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 14 ++-- .../i3plus/pojo/mes/bean/MesCustomerPart.java | 8 +- .../estsh/i3plus/pojo/mes/bean/MesDataObject.java | 8 +- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 16 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesESOP.java | 14 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 22 ++--- .../i3plus/pojo/mes/bean/MesEquTaskDetail.java | 16 ++-- .../estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 18 ++-- .../i3plus/pojo/mes/bean/MesEquTaskStandard.java | 18 ++-- .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 38 ++++----- .../cn/estsh/i3plus/pojo/mes/bean/MesEvent.java | 10 +-- .../estsh/i3plus/pojo/mes/bean/MesEventAction.java | 8 +- .../cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 8 +- .../cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java | 10 +-- .../cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 14 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 24 +++--- .../i3plus/pojo/mes/bean/MesLabelTemplate.java | 20 ++--- .../pojo/mes/bean/MesLabelTemplateParam.java | 22 ++--- .../cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 10 +-- .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 11 ++- .../estsh/i3plus/pojo/mes/bean/MesObjectDao.java | 6 +- .../i3plus/pojo/mes/bean/MesPLCConfigure.java | 16 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 57 +++++++++---- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 85 +++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPackageDetail.java | 59 +++++++++++++ .../i3plus/pojo/mes/bean/MesPackageTravel.java | 55 ++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 26 +++--- .../i3plus/pojo/mes/bean/MesPartCategory.java | 8 +- .../i3plus/pojo/mes/bean/MesPartScheduleBom.java | 10 +-- .../i3plus/pojo/mes/bean/MesPcnConnectLog.java | 14 ++-- .../estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 32 +++---- .../i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java | 12 +-- .../cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 28 +++---- .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 44 +++++----- .../cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java | 8 +- .../i3plus/pojo/mes/bean/MesProdCfgDetail.java | 8 +- .../estsh/i3plus/pojo/mes/bean/MesProdCfgType.java | 6 +- .../cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 63 ++++++++++++++ .../i3plus/pojo/mes/bean/MesProduceCategory.java | 8 +- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 + .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 42 +++++----- .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 2 +- .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 22 ++--- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 23 ++--- .../estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 20 ++--- .../cn/estsh/i3plus/pojo/mes/bean/MesRepair.java | 8 +- .../cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesScrap.java | 6 +- .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 12 +-- .../estsh/i3plus/pojo/mes/bean/MesShiftGroup.java | 6 +- .../estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 10 +-- .../cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java | 12 +-- .../estsh/i3plus/pojo/mes/bean/MesWcEquipment.java | 6 +- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 6 +- .../pojo/mes/bean/MesWorkCellMonitorLog.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 8 +- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 2 +- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 76 ++++++++--------- .../mes/engine/script/EngineScriptPersistence.java | 3 +- .../i3plus/pojo/mes/model/GenSerialNoModel.java | 6 +- .../i3plus/pojo/mes/model/MesDatasourceModel.java | 12 +-- .../i3plus/pojo/mes/model/MesEquipmentModel.java | 12 +-- .../i3plus/pojo/mes/model/MesEventActionModel.java | 1 - .../estsh/i3plus/pojo/mes/model/MesPlcModel.java | 16 ++-- .../i3plus/pojo/mes/model/QueueOrderModel.java | 1 + .../i3plus/pojo/mes/model/SysOrganizeModel.java | 6 +- .../mes/repository/MesCustProdLineRepository.java | 2 +- .../mes/repository/MesDatasourceRepository.java | 2 +- .../MesLabelTemplateParamRepository.java | 8 +- .../mes/repository/MesLabelTemplateRepository.java | 8 +- .../mes/repository/MesPackageDetailRepository.java | 14 ++++ .../pojo/mes/repository/MesPackageRepository.java | 14 ++++ .../mes/repository/MesPackageTravelRepository.java | 13 +++ .../pojo/mes/repository/MesProdPackRepository.java | 16 ++++ .../repository/MesProduceSnTravelRepository.java | 12 +-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 +++- 153 files changed, 1770 insertions(+), 941 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdPackRepository.java 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 d6549d0..00732f2 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 @@ -25,14 +25,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_AREA") +@Table(name = "MES_AREA") @Api("生产区域") public class MesArea extends BaseBean { - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; - @Column(name="AREA_NAME") + @Column(name = "AREA_NAME") @ApiParam("区域名称") private String areaName; } 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 f58ac6d..e8245d3 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 @@ -27,14 +27,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_BOM") +@Table(name = "MES_BOM") @Api("BOM清单") public class MesBom extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("父零件号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("父零件名称") private String partName; @@ -47,11 +47,11 @@ public class MesBom extends BaseBean { @ApiParam(value = "数量", example = "0") private Double qty; - @Column(name="ITEM_PART_NO") + @Column(name = "ITEM_PART_NO") @ApiParam("子零件") private String itemPartNo; - @Column(name="ITEM_PART_NAME") + @Column(name = "ITEM_PART_NAME") @ApiParam("子零件名称") private String itemPartName; @@ -70,12 +70,12 @@ public class MesBom extends BaseBean { @Column(name = "EFF_START_TIME") @ApiParam(value = "生效时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam(value = "失效时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String effEndTime; public double getQtyVal() { 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 b8830ef..2d8f0f2 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 @@ -25,30 +25,30 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_CONFIG") +@Table(name = "MES_CONFIG") @Api("mes配置表") public class MesConfig extends BaseBean { - @Column(name="CFG_CODE") + @Column(name = "CFG_CODE") @ApiParam("配置代码") private String cfgCode; - @Column(name="CFG_NAME") + @Column(name = "CFG_NAME") @ApiParam("配置名称") private String cfgName; - @Column(name="CFG_TYPE") + @Column(name = "CFG_TYPE") @ApiParam("配置类型") private String cfgType; - @Column(name="CFG_KEY") + @Column(name = "CFG_KEY") @ApiParam("配置key") private String cfgkey; - @Column(name="CFG_VALUE") + @Column(name = "CFG_VALUE") @ApiParam("配置value") private String cfgValue; - @Column(name="CFG_VAULE_DESC") + @Column(name = "CFG_VAULE_DESC") @ApiParam("配置value描述") private String cfgValueDesc; } 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 465a22a..3a8061e 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 @@ -25,14 +25,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_CUST_PROD_LINE") +@Table(name = "MES_CUST_PROD_LINE") @Api("客户产线代码") public class MesCustProdLine extends BaseBean { - @Column(name="CUST_PROD_LINE_CODE") + @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; - @Column(name="CUST_PROD_LINE_NAME") + @Column(name = "CUST_PROD_LINE_NAME") @ApiParam("客户产线名称") private String custProdLineName; } 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 243e1b4..75178c5 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 @@ -25,30 +25,30 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_CUSTOMER") +@Table(name = "MES_CUSTOMER") @Api("客户信息") public class MesCustomer extends BaseBean { - @Column(name="CUSTOMER_CODE") + @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; - @Column(name="CUSTOMER_NAME") + @Column(name = "CUSTOMER_NAME") @ApiParam("客户名称") private String customerName; - @Column(name="BRIEF_TEXT") + @Column(name = "BRIEF_TEXT") @ApiParam("客户简称") private String briefText; - @Column(name="ADDRESS") + @Column(name = "ADDRESS") @ApiParam("客户地址") private String address; - @Column(name="CONTACT") + @Column(name = "CONTACT") @ApiParam("客户联系人") private String contact; - @Column(name="TELEPHONE") + @Column(name = "TELEPHONE") @ApiParam("客户电话") private String telephone; } 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 b26dc90..1c9c4b8d2 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 @@ -27,20 +27,20 @@ import javax.persistence.Table; @Api("数据对象") public class MesDataObject extends BaseBean { - @Column(name="OBJECT_CODE") + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; - @Column(name="OBJECT_NAME") + @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; - @Column(name="DS_CODE") + @Column(name = "DS_CODE") @ApiParam("数据源代码") private String dsCode; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; } 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 0f2aa79..092f887 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 @@ -27,31 +27,31 @@ import javax.persistence.Table; @Api("地址清单") public class MesDatasource extends BaseBean { - @Column(name="DS_CODE") + @Column(name = "DS_CODE") @ApiParam("数据源代码") private String dsCode; - @Column(name="DS_NAME") + @Column(name = "DS_NAME") @ApiParam("数据源名称") private String dsName; - @Column(name="DS_TYPE") + @Column(name = "DS_TYPE") @ApiParam("数据源类型") private String dsType; - @Column(name="DS_HOST") + @Column(name = "DS_HOST") @ApiParam("主机") private String dsHost; - @Column(name="DS_PORT") + @Column(name = "DS_PORT") @ApiParam("端口") private Integer dsPort; - @Column(name="DS_USER") + @Column(name = "DS_USER") @ApiParam("用户名") private String dsUser; - @Column(name="DS_PASSWORD") + @Column(name = "DS_PASSWORD") @ApiParam("密码") private String dsPassword; @@ -59,7 +59,7 @@ public class MesDatasource extends BaseBean { @ApiParam("数据库名称") private String dsDbName; - @Column(name="EQUIPMENT_CODE") + @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 69cf64b..02b19fc 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 @@ -23,27 +23,27 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_ESOP") +@Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") public class MesESOP extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="ROUTE_CODE") + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; - @Column(name="PROCESS_CODE") + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; @@ -55,35 +55,35 @@ public class MesESOP extends BaseBean { @ApiParam("工步序号") private Integer stepSeq; - @Column(name="SOP_NAME") + @Column(name = "SOP_NAME") @ApiParam("SOP名称") private String sopName; - @Column(name="SOP_URL") + @Column(name = "SOP_URL") @ApiParam("SOP_URL") - private String sopUrl; + private String sopUrl; - @Column(name="GROUP_NAME") + @Column(name = "GROUP_NAME") @ApiParam("GROUP_NAME") private String groupName; - @Column(name="FILE_ORIGIN_NAME") + @Column(name = "FILE_ORIGIN_NAME") @ApiParam("FILE_ORIGIN_NAME") private String fileOriginName; - @Column(name="FILE_SIZE") + @Column(name = "FILE_SIZE") @ApiParam("FILE_SIZE") private String fileSize; - @Column(name="FILE_TYPE_ID") + @Column(name = "FILE_TYPE_ID") @ApiParam("FILE_TYPE_ID") private String fileTypeId; - @Column(name="FILE_TYPE_NAME") + @Column(name = "FILE_TYPE_NAME") @ApiParam("FILE_TYPE_NAME") private String fileTypeName; - @Column(name="SYNC_TAG") + @Column(name = "SYNC_TAG") @ApiParam("SYNC_TAG") - private Integer syncTag=0; + private Integer syncTag = 0; } 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 d14adac..d80c3db 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 @@ -28,68 +28,68 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_EQUIPMENT") +@Table(name = "MES_EQUIPMENT") @Api("生产设备") public class MesEquipment extends BaseBean { - @Column(name="EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; - @Column(name="EQUIPMENT_NAME") + @Column(name = "EQUIPMENT_NAME") @ApiParam("设备名称") private String equipmentName; - @Column(name="STATUS") + @Column(name = "STATUS") @ApiParam("设备状态") private Integer status; - @Column(name="EQUIPMENT_TYPE") + @Column(name = "EQUIPMENT_TYPE") @ApiParam("设备类型") private Integer equipmentType; - @Column(name="EQUIPMENT_CATEGORY") + @Column(name = "EQUIPMENT_CATEGORY") @ApiParam("设备类别") private String equipmentCategory; - @Column(name="EQUIPMENT_MODEL") + @Column(name = "EQUIPMENT_MODEL") @ApiParam("型号") private String equipmentModel; - @Column(name="EQUIPMENT_SPEC") + @Column(name = "EQUIPMENT_SPEC") @ApiParam("规格") private String equipmentSpec; - @Column(name="EQUIPMENT_MAKER") + @Column(name = "EQUIPMENT_MAKER") @ApiParam("制造商") private String equipmentMaker; - @Column(name="RELEASE_DATE") + @Column(name = "RELEASE_DATE") @ApiParam("出厂日期") private String releaseDate; - @Column(name="RECEIVE_DATE") + @Column(name = "RECEIVE_DATE") @ApiParam("接收日期") private String receiveDate; - @Column(name="ENABLE_DATE") + @Column(name = "ENABLE_DATE") @ApiParam("启用日期") private String enableDate; - @Column(name="CONNECT_TYPE") + @Column(name = "CONNECT_TYPE") @ApiParam("连接类型") private Integer connectType; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; @Transient - @ApiParam(value ="名称") + @ApiParam(value = "名称") private String name; // 默认值 -1 @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @ApiParam(value = "父节点", access = "父节点", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; } 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 521906a..b450200 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 @@ -27,19 +27,19 @@ import javax.persistence.Table; @Api("首检件配置") public class MesFiCfg extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="CUST_CODE") + @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; - @Column(name="FI_QTY") + @Column(name = "FI_QTY") @ApiParam("首检数量") private String fiQty; } 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 94c7b81..96102ec 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 @@ -26,30 +26,30 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_KP_DATA") +@Table(name = "MES_KP_DATA") @Api("生产区域") public class MesKpData extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="KEY_DATA_CODE") + @Column(name = "KEY_DATA_CODE") @ApiParam("关键数据代码") private String keyDataCode; - @Column(name="KEY_DATA_NAME") + @Column(name = "KEY_DATA_NAME") @ApiParam("关键数据名称") private String keyDataName; - @Column(name="KEY_DATA_COUNT") + @Column(name = "KEY_DATA_COUNT") @ApiParam("关键数据数量") private Integer keyDataCount; - @Column(name="UPPER_LIMIT") + @Column(name = "UPPER_LIMIT") @ApiParam("数据上限") private Double upperLimit; - @Column(name="LOWER_LIMIT") + @Column(name = "LOWER_LIMIT") @ApiParam("数据下限") private Double lowerLimit; 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 4b2ad82..73990e7 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 @@ -24,50 +24,50 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_KPSN_RULE") +@Table(name = "MES_KPSN_RULE") @Api("关键件条码校验规则") public class MesKpsnRule extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="LENGTH") + @Column(name = "LENGTH") @ApiParam("长度") private Integer length; - @Column(name="FROM1") + @Column(name = "FROM1") @ApiParam("起始1") private Integer from1; - @Column(name="TO1") + @Column(name = "TO1") @ApiParam("至1") private Integer to1; - @Column(name="FIX1") + @Column(name = "FIX1") @ApiParam("内容1") private String fix1; - @Column(name="FROM2") + @Column(name = "FROM2") @ApiParam("起始2") private Integer from2; - @Column(name="TO2") + @Column(name = "TO2") @ApiParam("至2") private Integer to2; - @Column(name="FIX2") + @Column(name = "FIX2") @ApiParam("内容2") private String fix2; - @Column(name="TYPE") + @Column(name = "TYPE") @ApiParam("类型") private String type; - @Column(name="BIND_RULE") + @Column(name = "BIND_RULE") @ApiParam("绑定规则") private Integer bandRule; - @Column(name="SUPPLIER_CODE") + @Column(name = "SUPPLIER_CODE") @ApiParam("供应商代码") private String supplierCode; 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 1f19e69..761a2f6 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 @@ -23,30 +23,30 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_LABEL_TEMPLATE") -@Api(value="打印模板",description = "打印模板") +@Table(name = "MES_LABEL_TEMPLATE") +@Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean { private static final long serialVersionUID = 5371856566557305323L; - @Column(name="TEMPLATE_CODE") - @ApiParam(value ="模板代码") + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") private String templateCode; - @Column(name="TEMPLATE_NAME") - @ApiParam(value ="模板名称") + @Column(name = "TEMPLATE_NAME") + @ApiParam(value = "模板名称") private String templateName; @Lob - @Column(name="TEMPLATE_CONTENT") - @ApiParam(value ="模板内容") + @Column(name = "TEMPLATE_CONTENT") + @ApiParam(value = "模板内容") private String templateContent; // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value ="模板参数拼接") + @ApiParam(value = "模板参数拼接") @Transient private String paramsPack; @Transient - @ApiParam(value ="模板id对应的模板参数") + @ApiParam(value = "模板id对应的模板参数") private List labelTemplateParamList; } 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 c93ff80..63552ba 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 @@ -24,31 +24,31 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_LABEL_TEMPLATE_PARAM") -@Api(value="打印模板参数",description = "打印模板参数") +@Table(name = "MES_LABEL_TEMPLATE_PARAM") +@Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean { private static final long serialVersionUID = 6476163540527157643L; - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") + @Column(name = "TEMPLATE_ID") + @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long templateId; - @Column(name="TEMPLATE_CODE") - @ApiParam(value ="模板代码") + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") private String templateCode; - @Column(name="TEMPLATE_PARAM") - @ApiParam(value ="模板参数") + @Column(name = "TEMPLATE_PARAM") + @ApiParam(value = "模板参数") private String templateParam; @Lob - @Column(name="TEMPLATE_PARAM_TEXT") - @ApiParam(value ="模板参数描述") + @Column(name = "TEMPLATE_PARAM_TEXT") + @ApiParam(value = "模板参数描述") private String templateParamText; // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value ="模板参数值") + @ApiParam(value = "模板参数值") @Transient private String templateParamValue; } 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 48ec4d9..c9f59b0 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 @@ -52,7 +52,15 @@ public class MesObjectCfg extends BaseBean { @ApiParam("主键标记") private String fieldPk; - @Column(name="POJO_ATTR") + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr; 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 0d139b8..f19880b 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 @@ -25,34 +25,34 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PLC_CONFIGURE") +@Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") public class MesPLCConfigure extends BaseBean { - @Column(name="IP") + @Column(name = "IP") @ApiParam("设备ip") private String ipAddress; - @Column(name="CHANNEL_NAME") + @Column(name = "CHANNEL_NAME") @ApiParam("通道名称") private String channelName; - @Column(name="DEVICE_NAME") + @Column(name = "DEVICE_NAME") @ApiParam("设备地址") private String deviceName; - @Column(name="TAG_NAME") + @Column(name = "TAG_NAME") @ApiParam("标签地址") private String tagName; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元") private String workCellCode; - @Column(name="WORK_CENTER_CODE") + @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/MesPackSpec.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java new file mode 100644 index 0000000..96f9229 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java @@ -0,0 +1,97 @@ +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.ColumnDefault; +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACK_SPEC") +@Api("包装规格") +public class MesPackSpec extends BaseBean { + @Column(name = "SPEC_CODE") + @ApiParam("包装规格代码") + private String specCode; + + @Column(name = "SPEC_NAME") + @ApiParam("包装规格名称") + private String specName; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "包装数量", example = "0") + private Double qty; + + @Column(name = "QTY2") + @ColumnDefault("0") + @ApiParam(value = "包装数量2", example = "0") + private Double qty2; + + @Column(name = "QTY3") + @ColumnDefault("0") + @ApiParam(value = "包装数量3", example = "0") + private Double qty3; + + @Column(name = "QTY4") + @ColumnDefault("0") + @ApiParam(value = "包装数量4", example = "0") + private Double qty4; + + @Column(name = "IS_MIXED") + @ApiParam("是否混包") + private Integer isMixed; + + @Column(name = "IS_MIXED2") + @ApiParam("是否混包2") + private Integer isMixed2; + + @Column(name = "IS_MIXED3") + @ApiParam("是否混包3") + private Integer isMixed3; + + @Column(name = "IS_MIXED4") + @ApiParam("是否混包4") + private Integer isMixed4; + + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getIsMixedVal() { + return this.isMixed == null ? 0 : this.isMixed; + } + + public int getIsMixed2Val() { + return this.isMixed2 == null ? 0 : this.isMixed2; + } + + public int getIsMixed3Val() { + return this.isMixed3 == null ? 0 : this.isMixed3; + } + + public int getIsMixed4Val() { + return this.isMixed4 == null ? 0 : this.isMixed4; + } + +} 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 new file mode 100644 index 0000000..5fbb803 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 1:26 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE") +@Api("包装规格") +public class MesPackage extends BaseBean { + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "PACK_SPEC_QTY") + @ApiParam("包装规格数量") + private Double packSpecQty; + + @Column(name = "NUIT") + @ApiParam("包装规格数量") + private String nuit; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "PACK_SPEC") + @ApiParam("包装规格") + private String packSpec; + + @Column(name = "IS_SEALED") + @ApiParam("是否封箱") + private Integer isSealed; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态10：未打印 20：已打印") + private Integer printStatus; + + @Column(name = "PACK_LEVEL") + @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { + this.packageNo = packageNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.packSpecQty = packSpecQty; + } +} 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 new file mode 100644 index 0000000..9424b33 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 2:55 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE") +@Api("包装规格") +public class MesPackageDetail extends BaseBean { + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品条码") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("产品条码") + private String partNameRdd; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编码2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编码3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编码4") + private String packageNo4; + + +} 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 new file mode 100644 index 0000000..89e6f89 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 3:23 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_TRAVEL") +@Api("包装履历表") +public class MesPackageTravel extends BaseBean { + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "OP_TYPE") + @ApiParam("操作类型") + private Integer opType; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编码2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编码3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编码4") + private String packageNo4; + + +} 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 785ecb7..172ce57 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 @@ -26,52 +26,52 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PART") +@Table(name = "MES_PART") @Api("物料信息") public class MesPart extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("零件名称") private String partName; - @Column(name="BRIEF_TEXT") + @Column(name = "BRIEF_TEXT") @ApiParam("零件简称") private String briefText; - @Column(name="PART_SPEC") + @Column(name = "PART_SPEC") @ApiParam("零件规格") private String partSpec; - @Column(name="CATEGORY_CODE1") + @Column(name = "CATEGORY_CODE1") @ApiParam("分类1") private String categoryCode1; - @Column(name="CATEGORY_CODE2") + @Column(name = "CATEGORY_CODE2") @ApiParam("分类2") private String categoryCode2; - @Column(name="CATEGORY_CODE3") + @Column(name = "CATEGORY_CODE3") @ApiParam("分类3") private String categoryCode3; - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") private String unit; - @Column(name="PACK_SPEC_CODE") + @Column(name = "PACK_SPEC_CODE") @ApiParam("包装规格代码") private String packSpecCode; - @Column(name="DEFAULT_WORK_CENTER") + @Column(name = "DEFAULT_WORK_CENTER") @ApiParam("默认工作中心") private String defaultWorkCenter; - @Column(name="PRODUCE_CATEGORY") + @Column(name = "PRODUCE_CATEGORY") @ApiParam("产品类型") - private String produceCategory; + private String produceCategory; @Transient @ApiParam("分类名称") 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 77e74cb..af18170 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 @@ -25,18 +25,18 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PART_CATEGORY") +@Table(name = "MES_PART_CATEGORY") @Api("零件种类") public class MesPartCategory extends BaseBean { - @Column(name="CATEGORY_CODE") + @Column(name = "CATEGORY_CODE") @ApiParam("分类代码") private String categoryCode; - @Column(name="CATEGORY_NAME") + @Column(name = "CATEGORY_NAME") @ApiParam("分类名称") private String categoryName; - @Column(name="CATEGORY_TYPE") + @Column(name = "CATEGORY_TYPE") @ApiParam("分类类型") private String categoryType; } 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 4fb79b5..818cbcb 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 @@ -24,42 +24,42 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN") +@Table(name = "MES_PCN") @Api("PCN节点") public class MesPcn extends BaseBean { - @Column(name="PCN_CODE") + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; - @Column(name="PCN_NAME") + @Column(name = "PCN_NAME") @ApiParam("PCN名称") private String pcnName; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域") private String areaCode; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; - @Column(name="PCN_VERSION") + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; - @Column(name="CONNECT_IP") + @Column(name = "CONNECT_IP") @ApiParam("连接IP") private String connectIp; - @Column(name="CONNECT_COUNT") + @Column(name = "CONNECT_COUNT") @ApiParam("连接次数") private Integer connectCount; - @Column(name="IS_CONNECT") + @Column(name = "IS_CONNECT") @ApiParam("是否连接") private Integer isConnect; - @Column(name="CONNECT_TIME") + @Column(name = "CONNECT_TIME") @ApiParam("连接时间") private String connectTime; 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 caaa169..aa394cc 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 @@ -24,30 +24,30 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_CONNECT_LOG") +@Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class MesPcnConnectLog extends BaseBean { - @Column(name="PCN_CODE") + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; - @Column(name="PCN_NAME") + @Column(name = "PCN_NAME") @ApiParam("PCN名称") private String pcnName; - @Column(name="PCN_VERSION") + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; - @Column(name="CONNECT_IP") + @Column(name = "CONNECT_IP") @ApiParam("连接IP") private String connectIp; - @Column(name="IS_CONNECT") + @Column(name = "IS_CONNECT") @ApiParam("是否连接") private Integer isConnect; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") private String Remark; } 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 3758a35..a715a1d 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 @@ -25,53 +25,53 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_SYNC_CFG") +@Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") public class MesPcnSyncCfg extends BaseBean { - @Column(name="PCN_CODE") + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; - @Column(name="OBJECT_CODE") + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; - @Column(name="OBJECT_NAME") + @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; - @Column(name="OBJECT_KEY") + @Column(name = "OBJECT_KEY") @ApiParam("对象主键") private String objectKey; - @Column(name="SYNC_FREQUENCY") + @Column(name = "SYNC_FREQUENCY") @ApiParam("同步频率") private Integer syncFrequency; - @Column(name="SYNC_TIME") + @Column(name = "SYNC_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value ="同步时间") + @ApiParam(value = "同步时间") private String syncTime; - @Column(name="SYNC_PATTERN")//2.新增 1.修改 + @Column(name = "SYNC_PATTERN")//2.新增 1.修改 @ApiParam("同步方式") private Integer syncPattern; - @Column(name="SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes + @Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes @ApiParam("同步类型") private Integer syncType; - @Column(name="LAST_SYNC_TIME") + @Column(name = "LAST_SYNC_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value ="上一同步时间") + @ApiParam(value = "上一同步时间") private String lastSyncTime; - @Column(name="EXTRACT_GAP") - @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制") + @Column(name = "EXTRACT_GAP") + @ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制") private Integer extractGap; - @Column(name="EXTRACT_CONDITION") - @ApiParam(value="从数据库抽取的条件限制") + @Column(name = "EXTRACT_CONDITION") + @ApiParam(value = "从数据库抽取的条件限制") private String extractCondition; public int getSyncFrequencyVal() { 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 a2d045a..8ea5d25 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 @@ -24,26 +24,26 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_SYNC_ERRORLOG") +@Table(name = "MES_PCN_SYNC_ERRORLOG") @Api("MES_PCN同步异常日志") public class MesPcnSyncErrorLog extends BaseBean { - @Column(name="PCN_CODE") + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; - @Column(name="OBJECT_CODE") + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; - @Column(name="OBJECT_NAME") + @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; - @Column(name="ERROR_SPOT") + @Column(name = "ERROR_SPOT") @ApiParam("异常位置") private String errorSpot; - @Column(name="ERROR_CONTENT") + @Column(name = "ERROR_CONTENT") @ApiParam("异常内容") private String errorContent; 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 9b659f9..e0cd19d 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 @@ -28,8 +28,8 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_SYS_USER_OFFLINE") -@Api(value="账号离线登陆表",description = "账号离线登陆表。") +@Table(name = "MES_PCN_SYS_USER_OFFLINE") +@Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class MesPcnSysUserOffline extends BaseBean { @Column(name = "USER_ID") @@ -49,13 +49,13 @@ public class MesPcnSysUserOffline extends BaseBean { @ApiParam(value = "登陆名称", access = "登陆名称") private String loginName; - @Column(name="ORGANIZE_ID") - @ApiParam(value ="部门ID" , example ="-1") + @Column(name = "ORGANIZE_ID") + @ApiParam(value = "部门ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long organizeId; - @Column(name="ORGANIZE_NAME") - @ApiParam(value ="部门名称" , access ="部门名称") + @Column(name = "ORGANIZE_NAME") + @ApiParam(value = "部门名称", access = "部门名称") private String organizeName; } 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 6088218..0160b54 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 @@ -25,59 +25,59 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_TASK") +@Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") public class MesPcnTask extends BaseBean { - @Column(name="TASK_CODE") + @Column(name = "TASK_CODE") @ApiParam("任务代码") private String taskCode; - @Column(name="TASK_NAME") + @Column(name = "TASK_NAME") @ApiParam("任务名称") private String taskName; - @Column(name="TASK_GROUP_NAME") + @Column(name = "TASK_GROUP_NAME") @ApiParam("任务组名称") private String taskGroupName; - @Column(name="TASK_DESCRIPTION") + @Column(name = "TASK_DESCRIPTION") @ApiParam("任务描述") private String taskDescription; - @Column(name="TASK_TYPE") + @Column(name = "TASK_TYPE") @ApiParam("任务类型") private Integer taskType; - @Column(name="TASK_MODULE") + @Column(name = "TASK_MODULE") @ApiParam("任务模块") private String taskModule; - @Column(name="TASK_CLASS") + @Column(name = "TASK_CLASS") @ApiParam("任务类名") private String taskClass; - @Column(name="TASK_PACKAGE") + @Column(name = "TASK_PACKAGE") @ApiParam("任务包名") private String taskPackage; - @Column(name="PCN_NAME") + @Column(name = "PCN_NAME") @ApiParam("PCN节点名称") private String pcnName; - @Column(name="PCN_CODE") + @Column(name = "PCN_CODE") @ApiParam("PCN节点名称代码") private String pcnCode; - @Column(name="TASK_CYCLE_EXPS") + @Column(name = "TASK_CYCLE_EXPS") @ApiParam("任务周期表达式") private String taskCycleExps; - @Column(name="TASK_CYCLE_DESCRIPTION") + @Column(name = "TASK_CYCLE_DESCRIPTION") @ApiParam("任务周期描述") private String taskCycleDescription; - @Column(name="TASK_PARAM") + @Column(name = "TASK_PARAM") @ApiParam("任务参数") private String taskParam; 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 8b5c605..c46fe73 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 @@ -25,23 +25,23 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_TASK_LOG") +@Table(name = "MES_PCN_TASK_LOG") @Api("mes-pcn定时任务工作清单同步记录") public class MesPcnTaskLog extends BaseBean { - @Column(name="SYNC_TIME_START") + @Column(name = "SYNC_TIME_START") @ApiParam("同步数据开始时间") private String syncTimeStart; - @Column(name="SYNC_TIME_END") + @Column(name = "SYNC_TIME_END") @ApiParam("同步数据截止时间") private String syncTimeEnd; - @Column(name="SYNC_STATUS") + @Column(name = "SYNC_STATUS") @ApiParam("同步状态") private Integer syncStatus; - @Column(name="ERROR_CONTENT") + @Column(name = "ERROR_CONTENT") @ApiParam("异常内容") private Long errorContent; 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 b71f632..b6833de 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 @@ -26,101 +26,101 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PLAN_ORDER") +@Table(name = "MES_PLAN_ORDER") @Api("生产主计划") public class MesPlanOrder extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("生产计划单号") private String orderNo; - @Column(name="PO_TYPE") + @Column(name = "PO_TYPE") @ApiParam("计划类型") private Integer planType; - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="PLAN_QTY") + @Column(name = "PLAN_QTY") @ApiParam("计划数量") private Double planQty; - @Column(name="DECOMPOSE_QTY") + @Column(name = "DECOMPOSE_QTY") @ApiParam("分解数量") private Double decomposeQty; - @Column(name="STATUS") + @Column(name = "STATUS") @ApiParam("状态") private Integer status; - @Column(name="START_TIME") + @Column(name = "START_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam("计划开始时间") private String startTime; - @Column(name="END_TIME") + @Column(name = "END_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam("计划结束时间") private String endTime; - @Column(name="DELIVERY_DATE") + @Column(name = "DELIVERY_DATE") @ApiParam("交货日期") private String deliveryDate; - @Column(name="CUST_CODE") + @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; - @Column(name="CUST_ORDER_NO") + @Column(name = "CUST_ORDER_NO") @ApiParam("客户订单号") private String custOrderNo; - @Column(name="SOURCE") + @Column(name = "SOURCE") @ApiParam("计划来源") private String source; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; /********************** 冗余字段 *********************************/ @Transient - @ApiParam(value="区域") + @ApiParam(value = "区域") public String areaCode; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") public String startTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") public String startTimeEnd; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") public String endTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") public String endTimeEnd; public double getPlanQtyVal() { 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 17322bb..5ac78dc 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 @@ -25,18 +25,18 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PROD_CFG") +@Table(name = "MES_PROD_CFG") @Api("产品配置") public class MesProdCfg extends BaseBean { - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="PROD_CFG_NAME") + @Column(name = "PROD_CFG_NAME") @ApiParam("产品配置名称") private String prodCfgName; - @Column(name="PROD_CFG_Type_CODE") + @Column(name = "PROD_CFG_Type_CODE") @ApiParam("产品配置类型代码") private String prodCfgTypeCode; } 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 new file mode 100644 index 0000000..5f3fc77 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 3:25 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_PACK") +@Api("产品包装关系") +public class MesProdPack extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "PACK_SPEC") + @ApiParam("包装规格") + private String packSpec; + + @Column(name = "PROD_LABEL_TEMPLATE") + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Column(name = "PACK_LABEL_TEMPLATE2") + @ApiParam("包装标签模板2") + private String packLabelTemplate2; + + @Column(name = "PACK_LABEL_TEMPLATE3") + @ApiParam("包装标签模板3") + private String packLabelTemplate3; + + @Column(name = "PACK_LABEL_TEMPLATE4") + @ApiParam("包装标签模板4") + private String packLabelTemplate4; + + @Column(name = "PROD_CFG_TYPE") + @ApiParam("项目") + private String prodCfgType; + + +} 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 286009a..5f7da9b 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 @@ -25,87 +25,91 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PRODUCE_SN") +@Table(name = "MES_PRODUCE_SN") @Api("产品条码表") public class MesProduceSn extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="QTY") + @Column(name = "QTY") @ApiParam("数量") private Double qty; - @Column(name="QC_STATUS") + @Column(name = "QC_STATUS") @ApiParam("质量状态") private Integer qcStatus; - @Column(name="SN_STATUS") + @Column(name = "SN_STATUS") @ApiParam("条码状态") private Integer snStatus; - @Column(name="PRINT_COUNT") + @Column(name = "PRINT_COUNT") @ApiParam("打印次数") private Integer printCount; - @Column(name="PRINT_STATUS") + @Column(name = "PRINT_STATUS") @ApiParam("打印状态") private Integer printStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="ROUTE_CODE") + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; - @Column(name="PROCESS_CODE") + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; - @Column(name="NEXT_PROCESS_CODE") + @Column(name = "NEXT_PROCESS_CODE") @ApiParam("下一工序代码") private String nextProcessCode; - @Column(name="IN_WC_TIME") + @Column(name = "IN_WC_TIME") @ApiParam("进产线时间") private String inWorkCenterTime; - @Column(name="OUT_WC_TIME") + @Column(name = "OUT_WC_TIME") @ApiParam("出产线时间") private String outWorkCenterTime; - @Column(name="SHIPPING_TIME") + @Column(name = "SHIPPING_TIME") @ApiParam("发运时间") private String shippingTime; - @Column(name="WORK_ORDER_NO") + @Column(name = "WORK_ORDER_NO") @ApiParam("生产工单号") private String workOrderNo; - @Column(name="CUST_SN") + @Column(name = "CUST_SN") @ApiParam("客户条码") private String custSn; - @Column(name="CUST_PART_NO") + @Column(name = "CUST_PART_NO") @ApiParam("客户零件号") private String custPartNo; - @Column(name="PACKAGE_SN") + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "PACKAGE_SN") @ApiParam("包装条码") private String packageSn; 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 e5b4ee2..0590a17 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 @@ -14,97 +14,97 @@ import javax.persistence.Table; import javax.persistence.Transient; /** -* @Description : 产品条码履历实体类 -* @Reference : -* @Author : dragon.xu -* @CreateDate : 2019-05-29 16:22 -* @Modify: -**/ + * @Description : 产品条码履历实体类 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 16:22 + * @Modify: + **/ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PRODUCE_SN_TRAVEL") +@Table(name = "MES_PRODUCE_SN_TRAVEL") @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="QTY") + @Column(name = "QTY") @ApiParam("数量") private Double qty; - @Column(name="QC_STATUS") + @Column(name = "QC_STATUS") @ApiParam("质量状态") private Integer qcStatus; - @Column(name="SN_STATUS") + @Column(name = "SN_STATUS") @ApiParam("条码状态") private Integer snStatus; - @Column(name="PRINT_COUNT") + @Column(name = "PRINT_COUNT") @ApiParam("打印次数") private Integer printCount; - @Column(name="PRINT_STATUS") + @Column(name = "PRINT_STATUS") @ApiParam("打印状态") private Integer printStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="ROUTE_CODE") + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; - @Column(name="PROCESS_CODE") + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; - @Column(name="NEXT_PROCESS_CODE") + @Column(name = "NEXT_PROCESS_CODE") @ApiParam("下一工序代码") private String nextProcessCode; - @Column(name="IN_WC_TIME") + @Column(name = "IN_WC_TIME") @ApiParam("进产线时间") private String inWorkCenterTime; - @Column(name="OUT_WC_TIME") + @Column(name = "OUT_WC_TIME") @ApiParam("出产线时间") private String outWorkCenterTime; - @Column(name="SHIPPING_TIME") + @Column(name = "SHIPPING_TIME") @ApiParam("发运时间") private String shippingTime; - @Column(name="WORK_ORDER_NO") + @Column(name = "WORK_ORDER_NO") @ApiParam("生产工单号") private String workOrderNo; - @Column(name="CUST_SN") + @Column(name = "CUST_SN") @ApiParam("客户条码") private String custSn; - @Column(name="CUST_PART_NO") + @Column(name = "CUST_PART_NO") @ApiParam("客户零件号") private String custPartNo; - @Column(name="PACKAGE_SN") + @Column(name = "PACKAGE_SN") @ApiParam("包装条码") private String packageSn; 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 f7d8843..5431d77 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 @@ -44,7 +44,7 @@ public class MesProductData extends BaseBean { @ApiParam("工作单元名称") private String workCellName; - @Column(name="SERIAL_NUMBER") + @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/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index bab8391..43d8681 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 @@ -26,7 +26,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_QC_CHECK_DATA") +@Table(name = "MES_QC_CHECK_DATA") @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean { 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 4301c73..09fd0cd 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 @@ -25,7 +25,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_QC_CHECK_STANDARD") +@Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") public class MesQcCheckStandard extends BaseBean { 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 dd3034b..fd39205 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 @@ -25,46 +25,46 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_QUEUE_ORDER") +@Table(name = "MES_QUEUE_ORDER") @Api("生产队列主表") public class MesQueueOrder extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("主队列编号") private String orderNo; - @Column(name="VIN_CODE") + @Column(name = "VIN_CODE") @ApiParam("Vin") private String vinCode; - @Column(name="CUST_FLAG_NO") + @Column(name = "CUST_FLAG_NO") @ApiParam("客户标识号") private String custFlagNo; - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="PROD_CFG_NAME_RDD") + @Column(name = "PROD_CFG_NAME_RDD") @ApiParam("产品配置名称") private String prodCfgNameRdd; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam("排序") private Double seq; - @Column(name="WORK_ORDER_NO") + @Column(name = "WORK_ORDER_NO") @ApiParam("生产工单号") private String workOrderNo; - @Column(name="STATUS") + @Column(name = "STATUS") @ApiParam("状态") private Integer status; - @Column(name="CUST_PROD_LINE_CODE") + @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; - @Column(name="AREA_CODE") + @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/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java index deb3bed..77c5220 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 @@ -25,18 +25,18 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_REPAIR") +@Table(name = "MES_REPAIR") @Api("维修") public class MesRepair extends BaseBean { - @Column(name="REPAIR_CODE") + @Column(name = "REPAIR_CODE") @ApiParam("维修代码") private String repairCode; - @Column(name="REPAIR_NAME") + @Column(name = "REPAIR_NAME") @ApiParam("维修名称") private String repariName; - @Column(name="REPAIR_TYPE") + @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") private Integer repairType; } 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 0fd49e3..cad4af5 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 @@ -25,14 +25,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_SCRAP") +@Table(name = "MES_SCRAP") @Api("报废原因") public class MesScrap extends BaseBean { - @Column(name="SCRAP_CODE") + @Column(name = "SCRAP_CODE") @ApiParam("报废代码") private String scrapCode; - @Column(name="SCRAP_NAME") + @Column(name = "SCRAP_NAME") @ApiParam("报废名称") private String scrapName; 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 37adc09..ed1d94a 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 @@ -25,26 +25,26 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_SHIFT") +@Table(name = "MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="SHIFT_CODE") + @Column(name = "SHIFT_CODE") @ApiParam("班次代码") private String shiftCode; - @Column(name="SHIFT_NAME") + @Column(name = "SHIFT_NAME") @ApiParam("班次名称") private String shiftName; - @Column(name="START_TIME") + @Column(name = "START_TIME") @ApiParam("开班时间") private String startTime; - @Column(name="WORK_TIMES") + @Column(name = "WORK_TIMES") @ApiParam("作业时长") private Double workTimes; } 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 bf6bb5e..f9af171 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 @@ -24,14 +24,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_SHIFT_GROUP") +@Table(name = "MES_SHIFT_GROUP") @Api("班组") public class MesShiftGroup extends BaseBean { - @Column(name="GROUP_CODE") + @Column(name = "GROUP_CODE") @ApiParam("班组代码") private String groupCode; - @Column(name="GROUP_NAME") + @Column(name = "GROUP_NAME") @ApiParam("班组名称") private String groupName; } 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 31ee917..5c7dad6 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 @@ -25,22 +25,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_SHIFT_REST") +@Table(name = "MES_SHIFT_REST") @Api("班次休息信息") public class MesShiftRest extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="SHIFT_CODE") + @Column(name = "SHIFT_CODE") @ApiParam("班次代码") private String shiftCode; - @Column(name="START_TIME") + @Column(name = "START_TIME") @ApiParam("开始时间") private String startTime; - @Column(name="REST_TIMES") + @Column(name = "REST_TIMES") @ApiParam("休息时长") private Double restTimes; } 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 0455aa2..76c3318 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 @@ -87,7 +87,7 @@ public class MesStep extends BaseBean { } public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq){ + String routeCode, String processCode, Integer stepSeq) { this.stepCode = stepCode; this.stepName = stepName; this.stepText = stepText; 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 52296a7..cac23de 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 @@ -25,71 +25,71 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_TORQUE_DETAIL") +@Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean { - @Column(name="SN") + @Column(name = "SN") @ApiParam("过程条码") private String serialNumber; - @Column(name="UPPER_LIMIT") + @Column(name = "UPPER_LIMIT") @ApiParam("最大值") private Double upperLimit; - @Column(name="LOWER_LIMIT") + @Column(name = "LOWER_LIMIT") @ApiParam("最小值") private Double lowerLimit; - @Column(name="TORQUE_DETAIL_VALUE") + @Column(name = "TORQUE_DETAIL_VALUE") @ApiParam("扭矩值") private Double torqueValue; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元") private String workCellCode; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; - @Column(name="ok") + @Column(name = "ok") @ApiParam("扭矩是否合格") private String ok; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="p_set") + @Column(name = "p_set") @ApiParam("螺丝枪PSET设置值") private String deviceSetValue; - @Column(name="MAXANGLE") + @Column(name = "MAXANGLE") @ApiParam("最大扭矩") private String maxAngle; - @Column(name="MINANGLE") + @Column(name = "MINANGLE") @ApiParam("最小扭矩") private String minAngel; - @Column(name="FINALANGLE") + @Column(name = "FINALANGLE") @ApiParam("最终扭矩") private Integer finalAngle; - @Column(name="WORK_ORDER_NO") + @Column(name = "WORK_ORDER_NO") @ApiParam("工单号") private String workOrderNo; - @Column(name="KEY_DATA_CODE") + @Column(name = "KEY_DATA_CODE") @ApiParam("关键数据代码") private String keyDataCode; - @Column(name="RESULT_MSG") + @Column(name = "RESULT_MSG") @ApiParam("扭矩判定结果") private String resultMsg; } 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 1d92aea..0160465 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 @@ -27,27 +27,27 @@ import javax.persistence.Table; @Api("开线检查") public class MesWcCheck extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("产品物料号") private String partNo; - @Column(name="CHECK_TYPE") + @Column(name = "CHECK_TYPE") @ApiParam("检查类型") private String checkType; - @Column(name="CHECK_OBJ") + @Column(name = "CHECK_OBJ") @ApiParam("检查对象") private String checkObj; - @Column(name="CHECK_ITEM") + @Column(name = "CHECK_ITEM") @ApiParam("检查项") private String checkItem; - @Column(name="STANDARD") + @Column(name = "STANDARD") @ApiParam("检查标准") private String standard; 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 e86a851..6a2aa0d 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 @@ -26,15 +26,15 @@ import javax.persistence.Table; @Table(name = "MES_WC_EQUIPMENT") @Api("工作单元设备关系表") public class MesWcEquipment extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="EQUIPMENT_CODE") + @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/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java index f8eb168..cdbbbe4 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 @@ -55,7 +55,7 @@ public class MesWorkCellMonitorLog extends BaseBean { @ApiParam("流程") private String routeCOde; - @Column(name="MESSAGE") + @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/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java index 1e447b8..bde424e 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 @@ -47,8 +47,8 @@ public class MesWorkCenter extends BaseBean { @ApiParam("生产区域代码") private String areaCode; - @Column(name="RUNNING_STATUS") + @Column(name = "RUNNING_STATUS") @ApiParam("运行状态") - private Integer runningStatus; + private String runningStatus; } 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 1e01fdd..82024e9 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 @@ -26,114 +26,114 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_WORK_ORDER") +@Table(name = "MES_WORK_ORDER") @Api("生产工单") public class MesWorkOrder extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="QTY") + @Column(name = "QTY") @ApiParam("数量") private Double qty; - @Column(name="COMPLETE_QTY") + @Column(name = "COMPLETE_QTY") @ApiParam("完成数量") private Double completeQty; - @Column(name="REPAIR_QTY") + @Column(name = "REPAIR_QTY") @ApiParam("返修数量") private Double repairQty; - @Column(name="SCRAP_QTY") + @Column(name = "SCRAP_QTY") @ApiParam("报废数量") private Double scrapQty; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam("工单序号") private Double seq; - @Column(name="WO_STATUS") + @Column(name = "WO_STATUS") @ApiParam("工单状态") private Integer workOrderStatus; - @Column(name="WO_TYPE") + @Column(name = "WO_TYPE") @ApiParam("工单类型") private Integer workOrderType; - @Column(name="NEXT_ORDER") + @Column(name = "NEXT_ORDER") @ApiParam("下一工单") private String nextOrder; - @Column(name="PLAN_ORDER_NO") + @Column(name = "PLAN_ORDER_NO") @ApiParam("生产计划单号") private String planOrderNo; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="SCHEDULE_DATE") + @Column(name = "SCHEDULE_DATE") @ApiParam("排产日期") private String scheduleDate; - @Column(name="CUST_PROD_LINE_CODE") + @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; - @Column(name="SHIFT_CODE") + @Column(name = "SHIFT_CODE") @ApiParam("班次") private String shiftCode; - @Column(name="START_TIME") + @Column(name = "START_TIME") @ApiParam("开始时间") private String startTime; - @Column(name="END_TIME") + @Column(name = "END_TIME") @ApiParam("结束时间") private String endTime; - @Column(name="WO_SOURCE") + @Column(name = "WO_SOURCE") @ApiParam("工单来源") private String workOrderSource; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; - @Column(name="SHIFT_GROUP") + @Column(name = "SHIFT_GROUP") @ApiParam("班组") private String shiftGroup; - @Column(name="APPROVAL_STATUS") + @Column(name = "APPROVAL_STATUS") @ApiParam("审批状态") private Integer approvalStatus; - @Column(name="CUST_CODE") + @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; - @Column(name="CUST_ORDER_NO") + @Column(name = "CUST_ORDER_NO") @ApiParam("客户订单号") private String custOrderNo; @@ -151,27 +151,27 @@ public class MesWorkOrder extends BaseBean { /********************** 冗余字段 *********************************/ @Transient - @ApiParam(value="工作中心名称") + @ApiParam(value = "工作中心名称") public String workCenterName; @Transient - @ApiParam(value="工作单元名称") + @ApiParam(value = "工作单元名称") public String workCellName; @Transient - @ApiParam(value="客户产线名称") + @ApiParam(value = "客户产线名称") public String custProdLineName; @Transient - @ApiParam(value="班次名称") + @ApiParam(value = "班次名称") public String shiftName; @Transient - @ApiParam(value="班组名称") + @ApiParam(value = "班组名称") public String shiftGroupName; @Transient - @ApiParam(value="产品配置名称") + @ApiParam(value = "产品配置名称") public String prodCfgName; @Transient @@ -180,23 +180,23 @@ public class MesWorkOrder extends BaseBean { @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") public String startTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") public String startTimeEnd; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") public String endTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") public String endTimeEnd; @Transient 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 c8f9018..d51705d 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 @@ -25,161 +25,161 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_WORK_ORDER_LOG") +@Table(name = "MES_WORK_ORDER_LOG") @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="QTY") + @Column(name = "QTY") @ApiParam("数量") private Double qty; - @Column(name="COMPLETE_QTY") + @Column(name = "COMPLETE_QTY") @ApiParam("完成数量") private Double completeQty; - @Column(name="REPAIR_QTY") + @Column(name = "REPAIR_QTY") @ApiParam("返修数量") private Double repairQty; - @Column(name="SCRAP_QTY") + @Column(name = "SCRAP_QTY") @ApiParam("报废数量") private Double scrapQty; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam("工单序号") private Double seq; - @Column(name="WO_STATUS") + @Column(name = "WO_STATUS") @ApiParam("工单状态") private Integer workOrderStatus; - @Column(name="WO_TYPE") + @Column(name = "WO_TYPE") @ApiParam("工单类型") private Integer workOrderType; - @Column(name="NEXT_ORDER") + @Column(name = "NEXT_ORDER") @ApiParam("下一工单") private String nextOrder; - @Column(name="PLAN_ORDER_NO") + @Column(name = "PLAN_ORDER_NO") @ApiParam("生产计划单号") private String planOrderNo; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="SCHEDULE_DATE") + @Column(name = "SCHEDULE_DATE") @ApiParam("排产日期") private String scheduleDate; - @Column(name="CUST_PROD_LINE_CODE") + @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; - @Column(name="SHIFT_CODE") + @Column(name = "SHIFT_CODE") @ApiParam("班次") private String shiftCode; - @Column(name="START_TIME") + @Column(name = "START_TIME") @ApiParam("开始时间") private String startTime; - @Column(name="END_TIME") + @Column(name = "END_TIME") @ApiParam("结束时间") private String endTime; - @Column(name="WO_SOURCE") + @Column(name = "WO_SOURCE") @ApiParam("工单来源") private String workOrderSource; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; - @Column(name="SHIFT_GROUP") + @Column(name = "SHIFT_GROUP") @ApiParam("班组") private String shiftGroup; - @Column(name="APPROVAL_STATUS") + @Column(name = "APPROVAL_STATUS") @ApiParam("审批状态") private Integer approvalStatus; - @Column(name="CUST_CODE") + @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; - @Column(name="CUST_ORDER_NO") + @Column(name = "CUST_ORDER_NO") @ApiParam("客户订单号") private String custOrderNo; /********************** 冗余字段 *********************************/ @Transient - @ApiParam(value="工作中心名称") + @ApiParam(value = "工作中心名称") public String workCenterName; @Transient - @ApiParam(value="工作单元名称") + @ApiParam(value = "工作单元名称") public String workCellName; @Transient - @ApiParam(value="客户产线名称") + @ApiParam(value = "客户产线名称") public String custProdLineName; @Transient - @ApiParam(value="班次名称") + @ApiParam(value = "班次名称") public String shiftName; @Transient - @ApiParam(value="班组名称") + @ApiParam(value = "班组名称") public String shiftGroupName; @Transient - @ApiParam(value="产品配置名称") + @ApiParam(value = "产品配置名称") public String prodCfgName; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") public String startTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") public String startTimeEnd; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") public String endTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") public String endTimeEnd; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java index 8f8db3d..f9bd6e8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java @@ -62,8 +62,8 @@ public class GenSerialNoModel { private String currentNumber; - public GenSerialNoModel(String ruleCode){ - this.ruleCode=ruleCode; + public GenSerialNoModel(String ruleCode) { + this.ruleCode = ruleCode; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java index 46c84c5..1c11d71 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java @@ -21,7 +21,7 @@ public class PlcCacheKeyModel { private String tag; - public PlcCacheKeyModel( String device, String tag) { + public PlcCacheKeyModel(String device, String tag) { this.device = device; this.tag = tag; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index 11b8373..19694f1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -40,6 +40,7 @@ public class QueueOrderModel implements Serializable { @Transient @ApiParam("显示颜色") private String color; + public QueueOrderModel() { } 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 078e102..e86fd56 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 @@ -27,7 +27,7 @@ public class StationResultBean implements Serializable { /** * 对于相同业务类型的数据，区分不同数据类型。 * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， - * image-图片 + * image-图片 */ @ApiParam("数据类型") private String dataType; @@ -36,7 +36,7 @@ public class StationResultBean implements Serializable { private String message; @ApiParam("List结果集") - private List resultList; + private List resultList; @ApiParam("结果对象") private Object resultObj; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index fbae009..385a651 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -16,7 +16,7 @@ import java.util.List; * @Modify: **/ @Data -@Api("过程条码打印信息模板") +@Api("打印信息模板") public class StepPrintSnModel extends MesProduceSn { @ApiParam("打印描述") private String printDesc; @@ -30,7 +30,7 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("批次号") private String batchNo; - @ApiParam("客户物料号") + @ApiParam("箱数量") private String boxQty; @ApiParam("订单号") @@ -38,4 +38,10 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("生产日期") private String productionTime; + + @ApiParam("包装编码") + private String packageNo; + + @ApiParam("包装规格") + private String packageSpec; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java index 80e7374..6dc2133 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -79,7 +79,7 @@ public class WcCheckModel { wcCheckModel.setRoutesColumn(new HashMap<>()); wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); - onlineSignalEqu=new MesWcCheckRecord(); + onlineSignalEqu = new MesWcCheckRecord(); wcCheckModel.setNeed2ShowMap(new HashMap<>()); Map dataColumnRelationMap = new HashMap<>(); diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java index c37b6ed..d285a59 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java @@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDataObject; * @CreateDate: 2019/9/27 1:59 PM * @Description: **/ -public interface MesDataObjectRepository extends BaseRepository { +public interface MesDataObjectRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java index b803066..36faed5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java @@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource; * @CreateDate: 2019/9/27 1:58 PM * @Description: **/ -public interface MesDatasourceRepository extends BaseRepository { +public interface MesDatasourceRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java index b74b509..ce73083 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java @@ -5,10 +5,10 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam; /** * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : **/ public interface MesLabelTemplateParamRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java index 1895f29..16f04a4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java @@ -5,10 +5,10 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; /** * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : **/ public interface MesLabelTemplateRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java new file mode 100644 index 0000000..fc409e1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackSpec; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPackSpecRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java new file mode 100644 index 0000000..7fd2655 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 10:33 上午 + * @Description: + **/ +public interface MesPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java new file mode 100644 index 0000000..eb7c894 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java @@ -0,0 +1,13 @@ +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.MesPackage; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 10:39 上午 + * @Description: + **/ +public interface MesPackageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java new file mode 100644 index 0000000..dde5b62 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java @@ -0,0 +1,13 @@ +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.MesPackageTravel; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 2:57 下午 + * @Description: + **/ +public interface MesPackageTravelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java new file mode 100644 index 0000000..cf70703 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdPack; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdPackRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java index 60298a3..607e64c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java @@ -6,12 +6,12 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel; import org.springframework.stereotype.Repository; /** -* @Description : 条码履历Dao层接口 -* @Reference : -* @Author : dragon.xu -* @CreateDate : 2019-05-29 16:36 -* @Modify: -**/ + * @Description : 条码履历Dao层接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 16:36 + * @Modify: + **/ @Repository public interface MesProduceSnTravelRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java index e1e757d..0e70427 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java @@ -9,5 +9,5 @@ import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment; * @CreateDate: 2019/9/28 12:04 PM * @Description: **/ -public interface MesWcEquipmentRepository extends BaseRepository { +public interface MesWcEquipmentRepository 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 61e57f3..c9a071a 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 @@ -82,6 +82,7 @@ public class MesHqlPack { /** * 获取工作中心下所有的投料数据 + * * @param mesCellFeed * @param org * @return @@ -96,6 +97,7 @@ public class MesHqlPack { /** * 获取原材料扫描信息的对应工序BOM + * * @param mesProcessBom * @param mesRawPartSn * @return @@ -105,7 +107,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean); - DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(),"isFeed",packBean); + DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean); return packBean; } 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 8f2872f..184d48e 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 @@ -25,18 +25,18 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_ACTION") +@Table(name = "MES_ACTION") @Api("mes系统业务动作") public class MesAction extends BaseBean { - @Column(name="ACTION_CODE") + @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; - @Column(name="ACTION_NAME") + @Column(name = "ACTION_NAME") @ApiParam("动作名称") private String actionName; - @Column(name="ACTION_TYPE") + @Column(name = "ACTION_TYPE") @ApiParam("动作类型") private Integer actionType; 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 ee779bb..0a7ad5a 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 @@ -25,18 +25,18 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_ACTION_METHOD") +@Table(name = "MES_ACTION_METHOD") @Api("系统业务动作方法") public class MesActionMethod extends BaseBean { - @Column(name="ACTION_CODE") + @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; - @Column(name="METHOD_CODE") + @Column(name = "METHOD_CODE") @ApiParam("方法代码") private String methodCode; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam("序号") private Integer seq; 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 1592590..b8cc379 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 @@ -29,28 +29,28 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_AREA") +@Table(name = "MES_AREA") @Api("生产区域") public class MesArea extends BaseBean { - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; - @Column(name="AREA_NAME") + @Column(name = "AREA_NAME") @ApiParam("区域名称") private String areaName; @Transient - @ApiParam(value ="子集列表") + @ApiParam(value = "子集列表") private List childTreeList; @Transient - @ApiParam(value ="名称") + @ApiParam(value = "名称") private String name; // 默认值 -1 @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @ApiParam(value = "父节点", access = "父节点", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; 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 dba4d9c..4b20366 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 @@ -27,14 +27,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_BOM") +@Table(name = "MES_BOM") @Api("BOM清单") public class MesBom extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("父零件号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("父零件名称") private String partName; @@ -47,11 +47,11 @@ public class MesBom extends BaseBean { @ApiParam(value = "数量", example = "0") private Double qty; - @Column(name="ITEM_PART_NO") + @Column(name = "ITEM_PART_NO") @ApiParam("子零件") private String itemPartNo; - @Column(name="ITEM_PART_NAME") + @Column(name = "ITEM_PART_NAME") @ApiParam("子零件名称") private String itemPartName; 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 02745c0..5c7d7ae 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 @@ -25,35 +25,35 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_BUTTON_STATUS") +@Table(name = "MES_BUTTON_STATUS") @Api("按钮状态配置表") public class MesButtonStatus extends BaseBean { - @Column(name="BUTTON_CODE") + @Column(name = "BUTTON_CODE") @ApiParam("按钮代码") private String buttonCode; - @Column(name="CLASS_NAME") + @Column(name = "CLASS_NAME") @ApiParam("实体类名称") private String ClassName; - @Column(name="STATUS_FIELD") + @Column(name = "STATUS_FIELD") @ApiParam("状态字段") private String statusField; - @Column(name="JUDGE_FLAG") + @Column(name = "JUDGE_FLAG") @ApiParam("判断符合") private String judgeFlag; - @Column(name="STATUS_VALUE") + @Column(name = "STATUS_VALUE") @ApiParam("状态值") private String statusValue; - @Column(name="LOGIC_FLAG") + @Column(name = "LOGIC_FLAG") @ApiParam("逻辑符合") private String logicFlag; - @Column(name="STATUS_DESC") + @Column(name = "STATUS_DESC") @ApiParam("描述") private String statusDesc; 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 6162bc0..e950b9c 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 @@ -25,30 +25,30 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_CONFIG") +@Table(name = "MES_CONFIG") @Api("mes配置表") public class MesConfig extends BaseBean { - @Column(name="CFG_CODE") + @Column(name = "CFG_CODE") @ApiParam("配置代码") private String cfgCode; - @Column(name="CFG_NAME") + @Column(name = "CFG_NAME") @ApiParam("配置名称") private String cfgName; - @Column(name="CFG_TYPE") + @Column(name = "CFG_TYPE") @ApiParam("配置类型") private String cfgType; - @Column(name="CFG_KEY") + @Column(name = "CFG_KEY") @ApiParam("配置key") private String cfgkey; - @Column(name="CFG_VALUE") + @Column(name = "CFG_VALUE") @ApiParam("配置value") private String cfgValue; - @Column(name="CFG_VAULE_DESC") + @Column(name = "CFG_VAULE_DESC") @ApiParam("配置value描述") private String cfgValueDesc; } 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 bd3711b..0c0caea 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 @@ -25,14 +25,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_CUST_PROD_LINE") +@Table(name = "MES_CUST_PROD_LINE") @Api("客户产线代码") public class MesCustProdLine extends BaseBean { - @Column(name="CUST_PROD_LINE_CODE") + @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; - @Column(name="CUST_PROD_LINE_NAME") + @Column(name = "CUST_PROD_LINE_NAME") @ApiParam("客户产线名称") private String custProdLineName; } 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 456094a..8be5b29 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 @@ -25,30 +25,30 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_CUSTOMER") +@Table(name = "MES_CUSTOMER") @Api("客户产线代码") public class MesCustomer extends BaseBean { - @Column(name="CUSTOMER_CODE") + @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; - @Column(name="CUSTOMER_NAME") + @Column(name = "CUSTOMER_NAME") @ApiParam("客户名称") private String customerName; - @Column(name="BRIEF_TEXT") + @Column(name = "BRIEF_TEXT") @ApiParam("客户简称") private String briefText; - @Column(name="ADDRESS") + @Column(name = "ADDRESS") @ApiParam("客户地址") private String address; - @Column(name="CONTACT") + @Column(name = "CONTACT") @ApiParam("客户联系人") private String contact; - @Column(name="TELEPHONE") + @Column(name = "TELEPHONE") @ApiParam("客户电话") private String telephone; } 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 c121d91..31e9109 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 @@ -25,18 +25,18 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_CUSTOMER_PART") +@Table(name = "MES_CUSTOMER_PART") @Api("客户零件关系") public class MesCustomerPart extends BaseBean { - @Column(name="CUSTOMER_CODE") + @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="CUSTOMER_PART_NO") + @Column(name = "CUSTOMER_PART_NO") @ApiParam("客户零件号") private String customerPartNo; 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 cf14ce8..c788f8a 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 @@ -27,20 +27,20 @@ import javax.persistence.Table; @Api("数据对象") public class MesDataObject extends BaseBean { - @Column(name="OBJECT_CODE") + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; - @Column(name="OBJECT_NAME") + @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; - @Column(name="DS_CODE") + @Column(name = "DS_CODE") @ApiParam("数据源代码") private String dsCode; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; } 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 9500bb0..89540d9 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 @@ -25,34 +25,34 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_DEFECT_RECORD") +@Table(name = "MES_DEFECT_RECORD") @Api("生产工单") public class MesDefectRecord extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="DEFECT_CODE") + @Column(name = "DEFECT_CODE") @ApiParam("不良代码") private String defectCode; - @Column(name="REPAIR_STATUS") + @Column(name = "REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; 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 15d4363..0f512b1 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 @@ -63,28 +63,28 @@ public class MesESOP extends BaseBean { @ApiParam("SOP_URL") private String sopUrl; - @Column(name="GROUP_NAME") + @Column(name = "GROUP_NAME") @ApiParam("GROUP_NAME") private String groupName; - @Column(name="FILE_ORIGIN_NAME") + @Column(name = "FILE_ORIGIN_NAME") @ApiParam("FILE_ORIGIN_NAME") private String fileOriginName; - @Column(name="FILE_SIZE") + @Column(name = "FILE_SIZE") @ApiParam("FILE_SIZE") private String fileSize; - @Column(name="FILE_TYPE_ID") + @Column(name = "FILE_TYPE_ID") @ApiParam("FILE_TYPE_ID") private String fileTypeId; - @Column(name="FILE_TYPE_NAME") + @Column(name = "FILE_TYPE_NAME") @ApiParam("FILE_TYPE_NAME") private String fileTypeName; - @Column(name="SYNC_TAG") + @Column(name = "SYNC_TAG") @ApiParam("SYNC_TAG") - private Integer syncTag=0; + private Integer syncTag = 0; } 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 2ab832c..1e1e351 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 @@ -25,43 +25,43 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_EQU_TASK") +@Table(name = "MES_EQU_TASK") @Api("设备作业任务") public class MesEquTask extends BaseBean { - @Column(name="TASK_NO") + @Column(name = "TASK_NO") @ApiParam("作业任务编号") private String taskNo; - @Column(name="TASK_TYPE") + @Column(name = "TASK_TYPE") @ApiParam("作业类型") private Integer taskType; - @Column(name="TASK_STATUS") + @Column(name = "TASK_STATUS") @ApiParam("作业状态") private Integer taskStatus; - @Column(name="WORK_CENTER_CODE") - @ApiParam(value="生产线") + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "生产线") private String workCenterCode; - @Column(name="PLAN_TIME") + @Column(name = "PLAN_TIME") @ApiParam("计划日期") private String planTime; - @Column(name="TASK_SOURCE") + @Column(name = "TASK_SOURCE") @ApiParam("任务来源") private Integer taskSource; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; - @Column(name="NOTIFY_FLAG") + @Column(name = "NOTIFY_FLAG") @ApiParam("通知标识") private Integer notifyFlag; - @Column(name="RELATE_TASK") + @Column(name = "RELATE_TASK") @ApiParam("关联任务") private String relateTask; 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 089895b..f25404e 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 @@ -25,35 +25,35 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_EQU_TASK_DETAIL") +@Table(name = "MES_EQU_TASK_DETAIL") @Api("设备作业任务明细") public class MesEquTaskDetail extends BaseBean { - @Column(name="TASK_NO") + @Column(name = "TASK_NO") @ApiParam("作业任务编号") private String taskNo; - @Column(name="EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; - @Column(name="EQUIPMENT_NAME") + @Column(name = "EQUIPMENT_NAME") @ApiParam("设备名称") private String equipmentName; - @Column(name="ACTION_STATUS") + @Column(name = "ACTION_STATUS") @ApiParam("执行状态") private Integer actionStatus; - @Column(name="FINAL_RESULT") + @Column(name = "FINAL_RESULT") @ApiParam("整体结果") private Integer finalResult; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; - @Column(name="REPAIR_FLAG") + @Column(name = "REPAIR_FLAG") @ApiParam("维修标识") private Integer repairFlag; 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 222fcdf..44f04ba 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 @@ -26,39 +26,39 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_EQU_TASK_PLAN") +@Table(name = "MES_EQU_TASK_PLAN") @Api("设备周期作业计划") public class MesEquTaskPlan extends BaseBean { - @Column(name="EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; - @Column(name="EQUIPMENT_NAME") + @Column(name = "EQUIPMENT_NAME") @ApiParam("设备名称") private String equipmentName; - @Column(name="TASK_TYPE") + @Column(name = "TASK_TYPE") @ApiParam("作业类型") private Integer taskType; - @Column(name="TASK_CYCLE") + @Column(name = "TASK_CYCLE") @ApiParam("周期(天)") private Integer taskCycle; - @Column(name="LAST_TIME") + @Column(name = "LAST_TIME") @ApiParam("上一执行时间") private String lastTime; - @Column(name="DAYS_IN_ADVANCE") + @Column(name = "DAYS_IN_ADVANCE") @ApiParam("创建提前天数") private Integer daysInAdvance; @Transient - @ApiParam(value="生产线") + @ApiParam(value = "生产线") private String workCenterCode; @Transient - @ApiParam(value="设备类别") + @ApiParam(value = "设备类别") private String equipmentCategory; @Transient 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 51d7fb3..038ee6e 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 @@ -26,39 +26,39 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_EQU_TASK_STANDARD") +@Table(name = "MES_EQU_TASK_STANDARD") @Api("设备作业要求") public class MesEquTaskStandard extends BaseBean { - @Column(name="EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; - @Column(name="EQUIPMENT_NAME") + @Column(name = "EQUIPMENT_NAME") @ApiParam("设备名称") private String equipmentName; - @Column(name="TASK_TYPE") + @Column(name = "TASK_TYPE") @ApiParam("作业类型") private Integer taskType; - @Column(name="ACTION_ITEM") + @Column(name = "ACTION_ITEM") @ApiParam("操作项") private String actionItem; - @Column(name="ACTION_STANDARD") + @Column(name = "ACTION_STANDARD") @ApiParam("操作标准") private String actionStandard; - @Column(name="ACTION_GUIDE") + @Column(name = "ACTION_GUIDE") @ApiParam("操作指导") private String actionGuide; @Transient - @ApiParam(value="生产线") + @ApiParam(value = "生产线") private String workCenterCode; @Transient - @ApiParam(value="设备类别") + @ApiParam(value = "设备类别") private String equipmentCategory; } 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 bdda980..1fa153b 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 @@ -28,80 +28,80 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_EQUIPMENT") +@Table(name = "MES_EQUIPMENT") @Api("生产设备") public class MesEquipment extends BaseBean { - @Column(name="EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; - @Column(name="EQUIPMENT_NAME") + @Column(name = "EQUIPMENT_NAME") @ApiParam("设备名称") private String equipmentName; - @Column(name="STATUS") + @Column(name = "STATUS") @ApiParam("设备状态") private Integer status; - @Column(name="EQUIPMENT_TYPE") + @Column(name = "EQUIPMENT_TYPE") @ApiParam("设备类型") private Integer equipmentType; - @Column(name="EQUIPMENT_CATEGORY") + @Column(name = "EQUIPMENT_CATEGORY") @ApiParam("设备类别") private String equipmentCategory; - @Column(name="EQUIPMENT_MODEL") + @Column(name = "EQUIPMENT_MODEL") @ApiParam("型号") private String equipmentModel; - @Column(name="EQUIPMENT_SPEC") + @Column(name = "EQUIPMENT_SPEC") @ApiParam("规格") private String equipmentSpec; - @Column(name="EQUIPMENT_MAKER") + @Column(name = "EQUIPMENT_MAKER") @ApiParam("制造商") private String equipmentMaker; - @Column(name="RELEASE_DATE") + @Column(name = "RELEASE_DATE") @ApiParam("出厂日期") private String releaseDate; - @Column(name="RECEIVE_DATE") + @Column(name = "RECEIVE_DATE") @ApiParam("接收日期") private String receiveDate; - @Column(name="ENABLE_DATE") + @Column(name = "ENABLE_DATE") @ApiParam("启用日期") private String enableDate; - @Column(name="CONNECT_TYPE") + @Column(name = "CONNECT_TYPE") @ApiParam("连接类型") private Integer connectType; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; @Transient - @ApiParam(value ="名称") + @ApiParam(value = "名称") private String name; @Transient - @ApiParam(value ="生产线") + @ApiParam(value = "生产线") private String workCenterCode; @Transient - @ApiParam(value ="工位") + @ApiParam(value = "工位") private String workCellCode; @Transient - @ApiParam(value ="区域") + @ApiParam(value = "区域") private String areaCode; // 默认值 -1 @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @ApiParam(value = "父节点", access = "父节点", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; } 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 9fe1a36..9716989 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 @@ -25,22 +25,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_EVENT") +@Table(name = "MES_EVENT") @Api("系统业务事件") public class MesEvent extends BaseBean { - @Column(name="EVENT_CODE") + @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; - @Column(name="EVENT_NAME") + @Column(name = "EVENT_NAME") @ApiParam("事件名称") private String eventName; - @Column(name="EVENT_TYPE") + @Column(name = "EVENT_TYPE") @ApiParam("事件类型") private Integer eventType; - @Column(name="BUTTON_CODE") + @Column(name = "BUTTON_CODE") @ApiParam("按钮代码") private String buttonCode; 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 3750ee0..0f90cc4 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 @@ -29,18 +29,18 @@ import javax.persistence.Table; @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name="MES_EVENT_ACTION") +@Table(name = "MES_EVENT_ACTION") @Api("系统业务事件动作") public class MesEventAction extends BaseBean { - @Column(name="EVENT_CODE") + @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; - @Column(name="ACTION_CODE") + @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam("序号") private Integer seq; 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 44dc7d0..f141d6d 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 @@ -27,19 +27,19 @@ import javax.persistence.Table; @Api("首检件配置") public class MesFiCfg extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="CUST_CODE") + @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; - @Column(name="FI_QTY") + @Column(name = "FI_QTY") @ApiParam("首检数量") private String fiQty; } 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 870ff9b..1812e98 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 @@ -24,22 +24,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_KEY_DATA") +@Table(name = "MES_KEY_DATA") @Api("设备关键数据") public class MesKeyData extends BaseBean { - @Column(name="KEY_DATA_CODE") + @Column(name = "KEY_DATA_CODE") @ApiParam("关键数据代码") private String keyDataCode; - @Column(name="KEY_DATA_NAME") + @Column(name = "KEY_DATA_NAME") @ApiParam("关键数据名称") private String keyDataName; - @Column(name="UPPER_LIMIT") + @Column(name = "UPPER_LIMIT") @ApiParam("数据上限") private Double upperLimit; - @Column(name="LOWER_LIMIT") + @Column(name = "LOWER_LIMIT") @ApiParam("数据下限") private Double lowerLimit; 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 1ada426..155c5c2 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 @@ -25,30 +25,30 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_KP_DATA") +@Table(name = "MES_KP_DATA") @Api("物料关键数据关系") public class MesKpData extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="KEY_DATA_CODE") + @Column(name = "KEY_DATA_CODE") @ApiParam("关键数据代码") private String keyDataCode; - @Column(name="KEY_DATA_NAME") + @Column(name = "KEY_DATA_NAME") @ApiParam("关键数据名称") private String keyDataName; - @Column(name="KEY_DATA_COUNT") + @Column(name = "KEY_DATA_COUNT") @ApiParam("关键数据数量") private Integer keyDataCount; - @Column(name="UPPER_LIMIT") + @Column(name = "UPPER_LIMIT") @ApiParam("数据上限") private Double upperLimit; - @Column(name="LOWER_LIMIT") + @Column(name = "LOWER_LIMIT") @ApiParam("数据下限") private Double lowerLimit; 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 1fa961f..8f9fb0c 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 @@ -24,50 +24,50 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_KPSN_RULE") +@Table(name = "MES_KPSN_RULE") @Api("关键件条码校验规则") public class MesKpsnRule extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="LENGTH") + @Column(name = "LENGTH") @ApiParam("长度") private Integer length; - @Column(name="FROM1") + @Column(name = "FROM1") @ApiParam("起始1") private Integer from1; - @Column(name="TO1") + @Column(name = "TO1") @ApiParam("至1") private Integer to1; - @Column(name="FIX1") + @Column(name = "FIX1") @ApiParam("内容1") private String fix1; - @Column(name="FROM2") + @Column(name = "FROM2") @ApiParam("起始2") private Integer from2; - @Column(name="TO2") + @Column(name = "TO2") @ApiParam("至2") private Integer to2; - @Column(name="FIX2") + @Column(name = "FIX2") @ApiParam("内容2") private String fix2; - @Column(name="TYPE") + @Column(name = "TYPE") @ApiParam("类型") private String type; - @Column(name="BIND_RULE") + @Column(name = "BIND_RULE") @ApiParam("绑定规则") private Integer bandRule; - @Column(name="SUPPLIER_CODE") + @Column(name = "SUPPLIER_CODE") @ApiParam("供应商代码") private String supplierCode; 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 e0db91a..7e6eff9 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 @@ -23,30 +23,30 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_LABEL_TEMPLATE") -@Api(value="打印模板",description = "打印模板") +@Table(name = "MES_LABEL_TEMPLATE") +@Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean { private static final long serialVersionUID = 5371856566557305323L; - @Column(name="TEMPLATE_CODE") - @ApiParam(value ="模板代码") + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") private String templateCode; - @Column(name="TEMPLATE_NAME") - @ApiParam(value ="模板名称") + @Column(name = "TEMPLATE_NAME") + @ApiParam(value = "模板名称") private String templateName; @Lob - @Column(name="TEMPLATE_CONTENT") - @ApiParam(value ="模板内容") + @Column(name = "TEMPLATE_CONTENT") + @ApiParam(value = "模板内容") private String templateContent; // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value ="模板参数拼接") + @ApiParam(value = "模板参数拼接") @Transient private String paramsPack; @Transient - @ApiParam(value ="模板id对应的模板参数") + @ApiParam(value = "模板id对应的模板参数") private List labelTemplateParamList; } 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 592450e..f64074e 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 @@ -24,31 +24,31 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_LABEL_TEMPLATE_PARAM") -@Api(value="打印模板参数",description = "打印模板参数") +@Table(name = "MES_LABEL_TEMPLATE_PARAM") +@Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean { private static final long serialVersionUID = 6476163540527157643L; - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") + @Column(name = "TEMPLATE_ID") + @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long templateId; - @Column(name="TEMPLATE_CODE") - @ApiParam(value ="模板代码") + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") private String templateCode; - @Column(name="TEMPLATE_PARAM") - @ApiParam(value ="模板参数") + @Column(name = "TEMPLATE_PARAM") + @ApiParam(value = "模板参数") private String templateParam; @Lob - @Column(name="TEMPLATE_PARAM_TEXT") - @ApiParam(value ="模板参数描述") + @Column(name = "TEMPLATE_PARAM_TEXT") + @ApiParam(value = "模板参数描述") private String templateParamText; // 参数拼接，多参数都好分隔，后台在做处理 - @ApiParam(value ="模板参数值") + @ApiParam(value = "模板参数值") @Transient private String templateParamValue; } 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 d01ed00..9cb2acc 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 @@ -25,25 +25,25 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_METHOD") +@Table(name = "MES_METHOD") @Api("系统业务方法") public class MesMethod extends BaseBean { - @Column(name="METHOD_CODE") + @Column(name = "METHOD_CODE") @ApiParam("方法代码") private String methodCode; - @Column(name="METHOD_NAME") + @Column(name = "METHOD_NAME") @ApiParam("方法名称") private String methodName; - @Column(name="CALL_CLASS") + @Column(name = "CALL_CLASS") @ApiParam("具体实现类") private String callClass; /** * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） */ - @Column(name="METHOD_TYPE") + @Column(name = "METHOD_TYPE") @ApiParam("方法类型") private Integer methodType; 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 a4bb5eb..e616922 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 @@ -52,7 +52,16 @@ public class MesObjectCfg extends BaseBean { @ApiParam("主键标记") private String fieldPk; - @Column(name="POJO_ATTR") + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + + @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr; 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 da55753..87f07f9 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 @@ -25,14 +25,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_OBJECT_DAO") +@Table(name = "MES_OBJECT_DAO") @Api("MES_对象与dao对应关系") public class MesObjectDao extends BaseBean { - @Column(name="OBJECT_CODE") + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; - @Column(name="DAO_CLASS") + @Column(name = "DAO_CLASS") @ApiParam("dao层类名") private String daoClass; 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 be0c7ee..9c320e4 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 @@ -25,34 +25,34 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PLC_CONFIGURE") +@Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") public class MesPLCConfigure extends BaseBean { - @Column(name="IP") + @Column(name = "IP") @ApiParam("设备ip") private String ipAddress; - @Column(name="CHANNEL_NAME") + @Column(name = "CHANNEL_NAME") @ApiParam("通道名称") private String channelName; - @Column(name="DEVICE_NAME") + @Column(name = "DEVICE_NAME") @ApiParam("设备地址") private String deviceName; - @Column(name="TAG_NAME") + @Column(name = "TAG_NAME") @ApiParam("标签地址") private String tagName; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元") private String workCellCode; - @Column(name="WORK_CENTER_CODE") + @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/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index 413a5ba..7feb2a8 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 @@ -26,33 +26,53 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PACK_SPEC") +@Table(name = "MES_PACK_SPEC") @Api("包装规格") public class MesPackSpec extends BaseBean { - @Column(name="SPEC_CODE") + @Column(name = "SPEC_CODE") @ApiParam("包装规格代码") private String specCode; - @Column(name="SPEC_NAME") + @Column(name = "SPEC_NAME") @ApiParam("包装规格名称") private String specName; - @Column(name="PARENT_SPEC") - @ApiParam("父包装规格代码") - private String parentSpec; - @Column(name = "QTY") @ColumnDefault("0") - @ApiParam(value = "数量", example = "0") + @ApiParam(value = "包装数量", example = "0") private Double qty; - @Column(name="IS_MIXED") + @Column(name = "QTY2") + @ColumnDefault("0") + @ApiParam(value = "包装数量2", example = "0") + private Double qty2; + + @Column(name = "QTY3") + @ColumnDefault("0") + @ApiParam(value = "包装数量3", example = "0") + private Double qty3; + + @Column(name = "QTY4") + @ColumnDefault("0") + @ApiParam(value = "包装数量4", example = "0") + private Double qty4; + + @Column(name = "IS_MIXED") @ApiParam("是否混包") private Integer isMixed; - @Column(name="SPEC_LEVEL") - @ApiParam("规格级别") - private Integer specLevel; + @Column(name = "IS_MIXED2") + @ApiParam("是否混包2") + private Integer isMixed2; + + @Column(name = "IS_MIXED3") + @ApiParam("是否混包3") + private Integer isMixed3; + + @Column(name = "IS_MIXED4") + @ApiParam("是否混包4") + private Integer isMixed4; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; @@ -62,7 +82,16 @@ public class MesPackSpec extends BaseBean { return this.isMixed == null ? 0 : this.isMixed; } - public int getSpecLevelVal() { - return this.specLevel == null ? 0 : this.specLevel; + public int getIsMixed2Val() { + return this.isMixed2 == null ? 0 : this.isMixed2; + } + + public int getIsMixed3Val() { + return this.isMixed3 == null ? 0 : this.isMixed3; } + + public int getIsMixed4Val() { + return this.isMixed4 == null ? 0 : this.isMixed4; + } + } 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 new file mode 100644 index 0000000..08e041a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -0,0 +1,85 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 1:26 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE") +@Api("包装规格") +public class MesPackage extends BaseBean { + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "PACK_SPEC_QTY") + @ApiParam("包装规格数量") + private Double packSpecQty; + + @Column(name = "NUIT") + @ApiParam("包装规格数量") + private String nuit; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "PACK_SPEC") + @ApiParam("包装规格") + private String packSpec; + + @Column(name = "IS_SEALED") + @ApiParam("是否封箱") + private Integer isSealed; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态10：未打印 20：已打印") + private Integer printStatus; + + @Column(name = "PACK_LEVEL") + @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + +} 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 new file mode 100644 index 0000000..a6594ad --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 2:55 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE") +@Api("包装规格") +public class MesPackageDetail extends BaseBean { + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品条码") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("产品条码") + private String partNameRdd; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编码2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编码3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编码4") + private String packageNo4; + + +} 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 new file mode 100644 index 0000000..4ac7024 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 3:23 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_TRAVEL") +@Api("包装履历表") +public class MesPackageTravel extends BaseBean { + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "OP_TYPE") + @ApiParam("操作类型") + private Integer opType; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编码2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编码3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编码4") + private String packageNo4; + + +} 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 d4eeaff..a617e17 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 @@ -26,52 +26,52 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PART") +@Table(name = "MES_PART") @Api("物料信息") public class MesPart extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("零件名称") private String partName; - @Column(name="BRIEF_TEXT") + @Column(name = "BRIEF_TEXT") @ApiParam("零件简称") private String briefText; - @Column(name="PART_SPEC") + @Column(name = "PART_SPEC") @ApiParam("零件规格") private String partSpec; - @Column(name="CATEGORY_CODE1") + @Column(name = "CATEGORY_CODE1") @ApiParam("分类1") private String categoryCode1; - @Column(name="CATEGORY_CODE2") + @Column(name = "CATEGORY_CODE2") @ApiParam("分类2") private String categoryCode2; - @Column(name="CATEGORY_CODE3") + @Column(name = "CATEGORY_CODE3") @ApiParam("分类3") private String categoryCode3; - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") private String unit; - @Column(name="PACK_SPEC_CODE") + @Column(name = "PACK_SPEC_CODE") @ApiParam("包装规格代码") private String packSpecCode; - @Column(name="DEFAULT_WORK_CENTER") + @Column(name = "DEFAULT_WORK_CENTER") @ApiParam("默认工作中心") private String defaultWorkCenter; - @Column(name="PRODUCE_CTGY_CODE") + @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") - private String produceCategoryCode; + private String produceCategoryCode; @Transient @ApiParam("产品类型名称") 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 1e87e22..c54eb24 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 @@ -25,18 +25,18 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PART_CATEGORY") +@Table(name = "MES_PART_CATEGORY") @Api("零件种类") public class MesPartCategory extends BaseBean { - @Column(name="CATEGORY_CODE") + @Column(name = "CATEGORY_CODE") @ApiParam("分类代码") private String categoryCode; - @Column(name="CATEGORY_NAME") + @Column(name = "CATEGORY_NAME") @ApiParam("分类名称") private String categoryName; - @Column(name="CATEGORY_TYPE") + @Column(name = "CATEGORY_TYPE") @ApiParam("分类类型") private String categoryType; } 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 228465a..2512950 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 @@ -24,22 +24,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PART_SCHEDULE_BOM") +@Table(name = "MES_PART_SCHEDULE_BOM") @Api("生产排程清单") public class MesPartScheduleBom extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("排程物料号") private String partNo; - @Column(name="ITEM_PART_NO") + @Column(name = "ITEM_PART_NO") @ApiParam("关联物料号") private String itemPartNo; - @Column(name="ITEM_QTY") + @Column(name = "ITEM_QTY") @ApiParam("用量") private Double itemQty; - @Column(name="SCHEDULE_TYPE") + @Column(name = "SCHEDULE_TYPE") @ApiParam("排程类型") private Integer scheduleType; 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 2342310..b33cb55 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 @@ -24,30 +24,30 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_CONNECT_LOG") +@Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class MesPcnConnectLog extends BaseBean { - @Column(name="PCN_CODE") + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; - @Column(name="PCN_NAME") + @Column(name = "PCN_NAME") @ApiParam("PCN名称") private String pcnName; - @Column(name="PCN_VERSION") + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; - @Column(name="CONNECT_IP") + @Column(name = "CONNECT_IP") @ApiParam("连接IP") private String connectIp; - @Column(name="IS_CONNECT") + @Column(name = "IS_CONNECT") @ApiParam("是否连接") private Integer isConnect; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") private String Remark; } 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 046faba..7501970 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 @@ -25,53 +25,53 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_SYNC_CFG") +@Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") public class MesPcnSyncCfg extends BaseBean { - @Column(name="PCN_CODE") + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; - @Column(name="OBJECT_CODE") + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; - @Column(name="OBJECT_NAME") + @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; - @Column(name="OBJECT_KEY") + @Column(name = "OBJECT_KEY") @ApiParam("对象主键") private String objectKey; - @Column(name="SYNC_FREQUENCY") + @Column(name = "SYNC_FREQUENCY") @ApiParam("同步频率") private Integer syncFrequency; - @Column(name="SYNC_TIME") + @Column(name = "SYNC_TIME") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value ="同步时间") + @ApiParam(value = "同步时间") private String syncTime; - @Column(name="SYNC_PATTERN")//2、新增 1、修改 + @Column(name = "SYNC_PATTERN")//2、新增 1、修改 @ApiParam("同步方式") private Integer syncPattern; - @Column(name="SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes + @Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes @ApiParam("同步类型") private Integer syncType; - @Column(name="LAST_SYNC_TIME") + @Column(name = "LAST_SYNC_TIME") // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value ="上一同步时间") + @ApiParam(value = "上一同步时间") private String lastSyncTime; - @Column(name="EXTRACT_GAP") - @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制") + @Column(name = "EXTRACT_GAP") + @ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制") private Integer extractGap; - @Column(name="EXTRACT_CONDITION") - @ApiParam(value="从数据库抽取的条件限制") + @Column(name = "EXTRACT_CONDITION") + @ApiParam(value = "从数据库抽取的条件限制") private String extractCondition; public int getSyncFrequencyVal() { 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 f17d4ad..0c83b33 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 @@ -24,26 +24,26 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_SYNC_ERRORLOG") +@Table(name = "MES_PCN_SYNC_ERRORLOG") @Api("MES_PCN同步异常日志") public class MesPcnSyncErrorLog extends BaseBean { - @Column(name="PCN_CODE") + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; - @Column(name="OBJECT_CODE") + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; - @Column(name="OBJECT_NAME") + @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; - @Column(name="ERROR_SPOT") + @Column(name = "ERROR_SPOT") @ApiParam("异常位置") private String errorSpot; - @Column(name="ERROR_CONTENT") + @Column(name = "ERROR_CONTENT") @ApiParam("异常内容") private String errorContent; 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 2da3ec8..80deb8f 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 @@ -25,59 +25,59 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PCN_TASK") +@Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") public class MesPcnTask extends BaseBean { - @Column(name="TASK_CODE") + @Column(name = "TASK_CODE") @ApiParam("任务代码") private String taskCode; - @Column(name="TASK_NAME") + @Column(name = "TASK_NAME") @ApiParam("任务名称") private String taskName; - @Column(name="TASK_GROUP_NAME") + @Column(name = "TASK_GROUP_NAME") @ApiParam("任务组名称") private String taskGroupName; - @Column(name="TASK_DESCRIPTION") + @Column(name = "TASK_DESCRIPTION") @ApiParam("任务描述") private String taskDescription; - @Column(name="TASK_TYPE") + @Column(name = "TASK_TYPE") @ApiParam("任务类型") private Integer taskType; - @Column(name="TASK_MODULE") + @Column(name = "TASK_MODULE") @ApiParam("任务模块") private String taskModule; - @Column(name="TASK_CLASS") + @Column(name = "TASK_CLASS") @ApiParam("任务类名") private String taskClass; - @Column(name="TASK_PACKAGE") + @Column(name = "TASK_PACKAGE") @ApiParam("任务包名") private String taskPackage; - @Column(name="PCN_NAME") + @Column(name = "PCN_NAME") @ApiParam("PCN节点名称") private String pcnName; - @Column(name="PCN_CODE") + @Column(name = "PCN_CODE") @ApiParam("PCN节点名称代码") private String pcnCode; - @Column(name="TASK_CYCLE_EXPS") + @Column(name = "TASK_CYCLE_EXPS") @ApiParam("任务周期表达式") private String taskCycleExps; - @Column(name="TASK_CYCLE_DESCRIPTION") + @Column(name = "TASK_CYCLE_DESCRIPTION") @ApiParam("任务周期描述") private String taskCycleDescription; - @Column(name="TASK_PARAM") + @Column(name = "TASK_PARAM") @ApiParam("任务参数") private String taskParam; 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 53478dc..f41bd25 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 @@ -30,101 +30,101 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PLAN_ORDER") +@Table(name = "MES_PLAN_ORDER") @Api("生产主计划") public class MesPlanOrder extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("生产计划单号") private String orderNo; - @Column(name="PO_TYPE") + @Column(name = "PO_TYPE") @ApiParam("计划类型") private Integer planType; - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="PLAN_QTY") + @Column(name = "PLAN_QTY") @ApiParam("计划数量") private Double planQty; - @Column(name="DECOMPOSE_QTY") + @Column(name = "DECOMPOSE_QTY") @ApiParam("分解数量") private Double decomposeQty; - @Column(name="STATUS") + @Column(name = "STATUS") @ApiParam("状态") private Integer status; - @Column(name="START_TIME") + @Column(name = "START_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam("计划开始时间") private String startTime; - @Column(name="END_TIME") + @Column(name = "END_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam("计划结束时间") private String endTime; - @Column(name="DELIVERY_DATE") + @Column(name = "DELIVERY_DATE") @ApiParam("交货日期") private String deliveryDate; - @Column(name="CUST_CODE") + @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; - @Column(name="CUST_ORDER_NO") + @Column(name = "CUST_ORDER_NO") @ApiParam("客户订单号") private String custOrderNo; - @Column(name="SOURCE") + @Column(name = "SOURCE") @ApiParam("计划来源") private String source; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; /********************** 冗余字段 *********************************/ @Transient - @ApiParam(value="区域") + @ApiParam(value = "区域") public String areaCode; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") public String startTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") public String startTimeEnd; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") public String endTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") public String endTimeEnd; public double getPlanQtyVal() { 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 8709d07..0bf480c 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 @@ -25,18 +25,18 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PROD_CFG") +@Table(name = "MES_PROD_CFG") @Api("产品配置") public class MesProdCfg extends BaseBean { - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="PROD_CFG_NAME") + @Column(name = "PROD_CFG_NAME") @ApiParam("产品配置名称") private String prodCfgName; - @Column(name="PROD_CFG_Type_CODE") + @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/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index b0e12ba..3a83eaf 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 @@ -26,18 +26,18 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PROD_CFG_DETAIL") +@Table(name = "MES_PROD_CFG_DETAIL") @Api("产品配置明细") public class MesProdCfgDetail extends BaseBean { - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; - @Column(name="IS_VIRTUAL") + @Column(name = "IS_VIRTUAL") @ApiParam("是否虚零件") private Integer isVirtual; 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 23e1b6b..c7b115c 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 @@ -25,14 +25,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PROD_CFG_TYPE") +@Table(name = "MES_PROD_CFG_TYPE") @Api("产品配置类型") public class MesProdCfgType extends BaseBean { - @Column(name="PROD_CFG_TYPE_CODE") + @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("产品配置类型代码") private String prodCfgTypeCode; - @Column(name="PROD_CFG_TYPE_NAME") + @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("产品配置类型名称") private String prodCfgTypeName; } 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 new file mode 100644 index 0000000..72fbe02 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 3:25 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_PACK") +@Api("产品包装关系") +public class MesProdPack extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "PACK_SPEC") + @ApiParam("包装规格") + private String packSpec; + + @Column(name = "PROD_LABEL_TEMPLATE") + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Column(name = "PACK_LABEL_TEMPLATE2") + @ApiParam("包装标签模板2") + private String packLabelTemplate2; + + @Column(name = "PACK_LABEL_TEMPLATE3") + @ApiParam("包装标签模板3") + private String packLabelTemplate3; + + @Column(name = "PACK_LABEL_TEMPLATE4") + @ApiParam("包装标签模板4") + private String packLabelTemplate4; + + @Column(name = "PROD_CFG_TYPE") + @ApiParam("项目") + private String prodCfgType; + + +} 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 538b63f..a648835 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 @@ -24,15 +24,15 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PRODUCE_CATEGORY") +@Table(name = "MES_PRODUCE_CATEGORY") @Api("系统业务动作") public class MesProduceCategory extends BaseBean { - @Column(name="PRODUCE_CTGY_CODE") + @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCategoryCode; - @Column(name="PRODUCE_CTGY_NAME") + @Column(name = "PRODUCE_CTGY_NAME") @ApiParam("产品类型名称") - private String produceCategoryName; + private String produceCategoryName; } 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 64cbab3..773d6ce 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 @@ -105,6 +105,10 @@ public class MesProduceSn extends BaseBean { @ApiParam("客户零件号") private String custPartNo; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + @Column(name = "PACKAGE_SN") @ApiParam("包装条码") private String packageSn; 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 5004d9d..dee99d3 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 @@ -25,86 +25,86 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PRODUCE_SN_TRAVEL") +@Table(name = "MES_PRODUCE_SN_TRAVEL") @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="QTY") + @Column(name = "QTY") @ApiParam("数量") private Double qty; - @Column(name="QC_STATUS") + @Column(name = "QC_STATUS") @ApiParam("质量状态") private Integer qcStatus; - @Column(name="SN_STATUS") + @Column(name = "SN_STATUS") @ApiParam("条码状态") private Integer snStatus; - @Column(name="PRINT_COUNT") + @Column(name = "PRINT_COUNT") @ApiParam("打印次数") private Integer printCount; - @Column(name="PRINT_STATUS") + @Column(name = "PRINT_STATUS") @ApiParam("打印状态") private Integer printStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="ROUTE_CODE") + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; - @Column(name="PROCESS_CODE") + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; - @Column(name="NEXT_PROCESS_CODE") + @Column(name = "NEXT_PROCESS_CODE") @ApiParam("下一工序代码") private String nextProcessCode; - @Column(name="IN_WC_TIME") + @Column(name = "IN_WC_TIME") @ApiParam("进产线时间") private String inWorkCenterTime; - @Column(name="OUT_WC_TIME") + @Column(name = "OUT_WC_TIME") @ApiParam("出产线时间") private String outWorkCenterTime; - @Column(name="SHIPPING_TIME") + @Column(name = "SHIPPING_TIME") @ApiParam("发运时间") private String shippingTime; - @Column(name="WORK_ORDER_NO") + @Column(name = "WORK_ORDER_NO") @ApiParam("生产工单号") private String workOrderNo; - @Column(name="CUST_SN") + @Column(name = "CUST_SN") @ApiParam("客户条码") private String custSn; - @Column(name="CUST_PART_NO") + @Column(name = "CUST_PART_NO") @ApiParam("客户零件号") private String custPartNo; - @Column(name="PACKAGE_SN") + @Column(name = "PACKAGE_SN") @ApiParam("包装条码") private String packageSn; 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 ddd2dde..1f62898 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 @@ -44,7 +44,7 @@ public class MesProductData extends BaseBean { @ApiParam("工作单元名称") private String workCellName; - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; 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 1e11e68..2ef1cb0 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 @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_QC_CHECK_STANDARD") +@Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") public class MesQcCheckStandard extends BaseBean { 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 940e112..7ea3abb 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 @@ -29,46 +29,46 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_QUEUE_ORDER") +@Table(name = "MES_QUEUE_ORDER") @Api("生产队列主表") public class MesQueueOrder extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("主队列编号") private String orderNo; - @Column(name="VIN_CODE") + @Column(name = "VIN_CODE") @ApiParam("Vin") private String vinCode; - @Column(name="CUST_FLAG_NO") + @Column(name = "CUST_FLAG_NO") @ApiParam("客户标识号") private String custFlagNo; - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="PROD_CFG_NAME_RDD") + @Column(name = "PROD_CFG_NAME_RDD") @ApiParam("产品配置名称") private String prodCfgNameRdd; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam("排序") private Double seq; - @Column(name="WORK_ORDER_NO") + @Column(name = "WORK_ORDER_NO") @ApiParam("生产工单号") private String workOrderNo; - @Column(name="STATUS") + @Column(name = "STATUS") @ApiParam("状态") private Integer status; - @Column(name="CUST_PROD_LINE_CODE") + @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; 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 636f096..416ae36 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 @@ -25,46 +25,46 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_QUEUE_ORDER_DETAIL") +@Table(name = "MES_QUEUE_ORDER_DETAIL") @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("主队列编号") private String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam("队列明细序号") private Double seq; - @Column(name="QTY") + @Column(name = "QTY") @ApiParam("数量") private Double qty; - @Column(name="STATUS") + @Column(name = "STATUS") @ApiParam("状态") private Integer status; - @Column(name="WORK_TYPE") + @Column(name = "WORK_TYPE") @ApiParam("生产类型") private String workOrderType; - @Column(name="PRODUCE_CATEGORY_CODE") + @Column(name = "PRODUCE_CATEGORY_CODE") @ApiParam("产品类型代码") private String produceCategoryCode; - @Column(name="PRODUCE_CATEGORY_NAME_RDD") + @Column(name = "PRODUCE_CATEGORY_NAME_RDD") @ApiParam("产品类型名称") private String produceCategoryNameRdd; @@ -75,6 +75,7 @@ public class MesQueueOrderDetail extends BaseBean { public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } + public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } 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 6a7254d..77054d4 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 @@ -25,42 +25,42 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_RAW_PART_SN") +@Table(name = "MES_RAW_PART_SN") @Api("原材料信息") public class MesRawPartSn extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("物料名称") private String partName; - @Column(name="RAW_TYPE") + @Column(name = "RAW_TYPE") @ApiParam("原料类型") private String rawType; - @Column(name="RAW_SN") + @Column(name = "RAW_SN") @ApiParam("原材料条码") private String rawSn; - @Column(name="RAW_QTY") + @Column(name = "RAW_QTY") @ApiParam("数量") private Long rawQty; - @Column(name="LOT_NO") + @Column(name = "LOT_NO") @ApiParam("生产批次") private String lotNo; - @Column(name="FIX_LOT_NO") + @Column(name = "FIX_LOT_NO") @ApiParam("特殊批次") private String fixLotNo; - @Column(name="STATUS") + @Column(name = "STATUS") @ApiParam("原料状态") private Integer status; - @Column(name="SUPPLIER_CODE") + @Column(name = "SUPPLIER_CODE") @ApiParam("供应商代码") private String supplierCode; 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 98ecaa6..98709ec 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 @@ -25,18 +25,18 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_REPAIR") +@Table(name = "MES_REPAIR") @Api("维修") public class MesRepair extends BaseBean { - @Column(name="REPAIR_CODE") + @Column(name = "REPAIR_CODE") @ApiParam("维修代码") private String repairCode; - @Column(name="REPAIR_NAME") + @Column(name = "REPAIR_NAME") @ApiParam("维修名称") private String repairName; - @Column(name="REPAIR_TYPE") + @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") private Integer repairType; } 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 603403b..8bbbb0f 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 @@ -38,7 +38,7 @@ public class MesRoute extends BaseBean { @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; - + @Column(name = "ROUTE_TYPE") @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; 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 39c21f7..f376d66 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 @@ -25,14 +25,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_SCRAP") +@Table(name = "MES_SCRAP") @Api("报废原因") public class MesScrap extends BaseBean { - @Column(name="SCRAP_CODE") + @Column(name = "SCRAP_CODE") @ApiParam("报废代码") private String scrapCode; - @Column(name="SCRAP_NAME") + @Column(name = "SCRAP_NAME") @ApiParam("报废名称") private String scrapName; 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 9c4f50a..9122185 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 @@ -25,26 +25,26 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_SHIFT") +@Table(name = "MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="SHIFT_CODE") + @Column(name = "SHIFT_CODE") @ApiParam("班次代码") private String shiftCode; - @Column(name="SHIFT_NAME") + @Column(name = "SHIFT_NAME") @ApiParam("班次名称") private String shiftName; - @Column(name="START_TIME") + @Column(name = "START_TIME") @ApiParam("开班时间") private String startTime; - @Column(name="WORK_TIMES") + @Column(name = "WORK_TIMES") @ApiParam("作业时长") private Double workTimes; } 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 f31bdf6..684bc7e 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 @@ -24,14 +24,14 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_SHIFT_GROUP") +@Table(name = "MES_SHIFT_GROUP") @Api("班组") public class MesShiftGroup extends BaseBean { - @Column(name="GROUP_CODE") + @Column(name = "GROUP_CODE") @ApiParam("班组代码") private String groupCode; - @Column(name="GROUP_NAME") + @Column(name = "GROUP_NAME") @ApiParam("班组名称") private String groupName; } 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 9c61ae3..6d82d9e 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 @@ -25,22 +25,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_SHIFT_REST") +@Table(name = "MES_SHIFT_REST") @Api("班次休息信息") public class MesShiftRest extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="SHIFT_CODE") + @Column(name = "SHIFT_CODE") @ApiParam("班次代码") private String shiftCode; - @Column(name="START_TIME") + @Column(name = "START_TIME") @ApiParam("开始时间") private String startTime; - @Column(name="REST_TIMES") + @Column(name = "REST_TIMES") @ApiParam("休息时长") private Double restTimes; } 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 7d809e5..4a3ace4 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 @@ -27,27 +27,27 @@ import javax.persistence.Table; @Api("开线检查") public class MesWcCheck extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("产品物料号") private String partNo; - @Column(name="CHECK_TYPE") + @Column(name = "CHECK_TYPE") @ApiParam("检查类型") private String checkType; - @Column(name="CHECK_OBJ") + @Column(name = "CHECK_OBJ") @ApiParam("检查对象") private String checkObj; - @Column(name="CHECK_ITEM") + @Column(name = "CHECK_ITEM") @ApiParam("检查项") private String checkItem; - @Column(name="STANDARD") + @Column(name = "STANDARD") @ApiParam("检查标准") private String standard; 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 1a228bf..4cc2a15 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 @@ -27,15 +27,15 @@ import javax.persistence.Table; @Api("工作单元设备关系表") public class MesWcEquipment extends BaseBean { - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; 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 9969c7c..def516b 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 @@ -48,16 +48,16 @@ public class MesWorkCell extends BaseBean { private String areaCode; @Transient - @ApiParam(value ="子集列表") + @ApiParam(value = "子集列表") private List childTreeList; @Transient - @ApiParam(value ="名称") + @ApiParam(value = "名称") private String name; // 默认值 -1 @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @ApiParam(value = "父节点", access = "父节点", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; } 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 2aa0975..9f3f20a 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 @@ -55,7 +55,7 @@ public class MesWorkCellMonitorLog extends BaseBean { @ApiParam("流程") private String routeCOde; - @Column(name="MESSAGE") + @Column(name = "MESSAGE") @ApiParam("异常信息") private String message; } 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 8da1f4a..67622a0 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 @@ -51,21 +51,21 @@ public class MesWorkCenter extends BaseBean { @ApiParam("生产区域代码") private String areaCode; - @Column(name="RUNNING_STATUS") + @Column(name = "RUNNING_STATUS") @ApiParam("运行状态") private Integer runningStatus; @Transient - @ApiParam(value ="子集列表") + @ApiParam(value = "子集列表") private List childTreeList; @Transient - @ApiParam(value ="名称") + @ApiParam(value = "名称") private String name; // 默认值 -1 @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @ApiParam(value = "父节点", access = "父节点", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; } 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 8edb6bf..924d37c 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 @@ -133,7 +133,7 @@ public class MesWorkOrder extends BaseBean { @ApiParam("客户代码") private String custCode; - @Column(name="CUST_ORDER_NO") + @Column(name = "CUST_ORDER_NO") @ApiParam("客户订单号") private String custOrderNo; 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 df1dcb6..4aa275b 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 @@ -26,161 +26,161 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_WORK_ORDER_LOG") +@Table(name = "MES_WORK_ORDER_LOG") @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="PROD_CFG_CODE") + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name="QTY") + @Column(name = "QTY") @ApiParam("数量") private Double qty; - @Column(name="COMPLETE_QTY") + @Column(name = "COMPLETE_QTY") @ApiParam("完成数量") private Double completeQty; - @Column(name="REPAIR_QTY") + @Column(name = "REPAIR_QTY") @ApiParam("返修数量") private Double repairQty; - @Column(name="SCRAP_QTY") + @Column(name = "SCRAP_QTY") @ApiParam("报废数量") private Double scrapQty; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam("工单序号") private Double seq; - @Column(name="WO_STATUS") + @Column(name = "WO_STATUS") @ApiParam("工单状态") private Integer workOrderStatus; - @Column(name="WO_TYPE") + @Column(name = "WO_TYPE") @ApiParam("工单类型") private Integer workOrderType; - @Column(name="NEXT_ORDER") + @Column(name = "NEXT_ORDER") @ApiParam("下一工单") private String nextOrder; - @Column(name="PLAN_ORDER_NO") + @Column(name = "PLAN_ORDER_NO") @ApiParam("生产计划单号") private String planOrderNo; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="SCHEDULE_DATE") + @Column(name = "SCHEDULE_DATE") @ApiParam("排产日期") private String scheduleDate; - @Column(name="CUST_PROD_LINE_CODE") + @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; - @Column(name="SHIFT_CODE") + @Column(name = "SHIFT_CODE") @ApiParam("班次") private String shiftCode; - @Column(name="START_TIME") + @Column(name = "START_TIME") @ApiParam("开始时间") private String startTime; - @Column(name="END_TIME") + @Column(name = "END_TIME") @ApiParam("结束时间") private String endTime; - @Column(name="WO_SOURCE") + @Column(name = "WO_SOURCE") @ApiParam("工单来源") private String workOrderSource; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; - @Column(name="SHIFT_GROUP") + @Column(name = "SHIFT_GROUP") @ApiParam("班组") private String shiftGroup; - @Column(name="APPROVAL_STATUS") + @Column(name = "APPROVAL_STATUS") @ApiParam("审批状态") private Integer approvalStatus; - @Column(name="CUST_CODE") + @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; - @Column(name="CUST_ORDER_NO") + @Column(name = "CUST_ORDER_NO") @ApiParam("客户订单号") private String custOrderNo; /********************** 冗余字段 *********************************/ @Transient - @ApiParam(value="工作中心名称") + @ApiParam(value = "工作中心名称") public String workCenterName; @Transient - @ApiParam(value="工作单元名称") + @ApiParam(value = "工作单元名称") public String workCellName; @Transient - @ApiParam(value="客户产线名称") + @ApiParam(value = "客户产线名称") public String custProdLineName; @Transient - @ApiParam(value="班次名称") + @ApiParam(value = "班次名称") public String shiftName; @Transient - @ApiParam(value="班组名称") + @ApiParam(value = "班组名称") public String shiftGroupName; @Transient - @ApiParam(value="产品配置名称") + @ApiParam(value = "产品配置名称") public String prodCfgName; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") public String startTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") public String startTimeEnd; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") public String endTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") + @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") public String endTimeEnd; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java index f5e33c7..f61a055 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java @@ -48,7 +48,8 @@ public class EngineScriptPersistence extends BaseBean { @Transient private CompiledScript compiledScript; - public EngineScriptPersistence() {} + public EngineScriptPersistence() { + } // 构造方法，便于批量创建数据 public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType, diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 07c9423..e99c124 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -22,7 +22,7 @@ import javax.persistence.Column; @NoArgsConstructor @AllArgsConstructor @Api("生成条码模型") -public class GenSerialNoModel { +public class GenSerialNoModel { @ApiParam("规则代码") private String ruleCode; @@ -67,8 +67,8 @@ public class GenSerialNoModel { private String currentNumber; - public GenSerialNoModel(String ruleCode){ - this.ruleCode=ruleCode; + public GenSerialNoModel(String ruleCode) { + this.ruleCode = ruleCode; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java index f83d057..ddfb036 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java @@ -23,22 +23,22 @@ public class MesDatasourceModel implements Serializable { @ApiParam("设备名称") private String equipmentName; - @ApiParam( "有效性") + @ApiParam("有效性") public Integer isValid; - @ApiParam( "是否已删除") + @ApiParam("是否已删除") public Integer isDeleted; - @ApiParam( "创建用户") + @ApiParam("创建用户") public String createUser; - @ApiParam( "创建日期") + @ApiParam("创建日期") public String createDatetime; - @ApiParam( "修改人") + @ApiParam("修改人") public String modifyUser; - @ApiParam( "修改日期") + @ApiParam("修改日期") public String modifyDatetime; @ApiParam("组织代码") 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 5e09c06..d075c60 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 @@ -67,22 +67,22 @@ public class MesEquipmentModel implements Serializable { @ApiParam("组织代码") public String organizeCode; - @ApiParam( "有效性") + @ApiParam("有效性") public Integer isValid; - @ApiParam( "是否已删除") + @ApiParam("是否已删除") public Integer isDeleted; - @ApiParam( "创建用户") + @ApiParam("创建用户") public String createUser; - @ApiParam( "创建日期") + @ApiParam("创建日期") public String createDatetime; - @ApiParam( "修改人") + @ApiParam("修改人") public String modifyUser; - @ApiParam( "修改日期") + @ApiParam("修改日期") public String modifyDatetime; @ApiParam("设备状态") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEventActionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEventActionModel.java index a3994e7..d317eea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEventActionModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEventActionModel.java @@ -37,7 +37,6 @@ public class MesEventActionModel implements Serializable { private String eventCode; - @ApiParam("序号") private Integer seq; 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 ab63d8f..229352c 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 @@ -23,22 +23,22 @@ public class MesPlcModel implements Serializable { @ApiParam("设备名称") private String equipmentName; - @ApiParam( "有效性") + @ApiParam("有效性") public Integer isValid; - @ApiParam( "是否已删除") + @ApiParam("是否已删除") public Integer isDeleted; - @ApiParam( "创建用户") + @ApiParam("创建用户") public String createUser; - @ApiParam( "创建日期") + @ApiParam("创建日期") public String createDatetime; - @ApiParam( "修改人") + @ApiParam("修改人") public String modifyUser; - @ApiParam( "修改日期") + @ApiParam("修改日期") public String modifyDatetime; @ApiParam("组织代码") @@ -86,14 +86,14 @@ public class MesPlcModel implements Serializable { @ApiParam("是否解析") private String isAnalysis; - public MesPlcModel(){ + public MesPlcModel() { } public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis){ + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index f2dd1e2..5c9e79c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -41,6 +41,7 @@ public class QueueOrderModel implements Serializable { @Transient @ApiParam("显示颜色") private String color; + public QueueOrderModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java index a3d574c..f5d38f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java @@ -9,15 +9,15 @@ import java.util.List; public class SysOrganizeModel { @Transient - @ApiParam(value ="父节点") + @ApiParam(value = "父节点") private Long parentId; @Transient - @ApiParam(value ="名称") + @ApiParam(value = "名称") private String name; @Transient - @ApiParam(value ="子集列表") + @ApiParam(value = "子集列表") private List childTreeList; public List getChildTreeList() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java index b8c4290..89de2ab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesCustProdLineRepository extends BaseRepository { +public interface MesCustProdLineRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDatasourceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDatasourceRepository.java index 77f4d89..1daf43d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDatasourceRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDatasourceRepository.java @@ -11,5 +11,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesDatasource; * @CreateDate:2019\10\9 * @Modify: **/ -public interface MesDatasourceRepository extends BaseRepository { +public interface MesDatasourceRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java index 132c99d..aa64ca4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java @@ -5,10 +5,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam; /** * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : **/ public interface MesLabelTemplateParamRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java index 55f667a..a04bd29 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java @@ -5,10 +5,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; /** * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : **/ public interface MesLabelTemplateRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java new file mode 100644 index 0000000..96f3c6a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail; + + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 10:33 上午 + * @Description: + **/ +public interface MesPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageRepository.java new file mode 100644 index 0000000..0e7ea21 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPackage; + + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 10:39 上午 + * @Description: + **/ +public interface MesPackageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java new file mode 100644 index 0000000..3bef25a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.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.MesPackageTravel; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 2:57 下午 + * @Description: + **/ +public interface MesPackageTravelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdPackRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdPackRepository.java new file mode 100644 index 0000000..ada4b86 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdPackRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdPack; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdPackRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java index f128b7c..9e831a0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java @@ -5,12 +5,12 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProduceSnTravel; import org.springframework.stereotype.Repository; /** -* @Description : 条码履历Dao层接口 -* @Reference : -* @Author : dragon.xu -* @CreateDate : 2019-05-29 16:36 -* @Modify: -**/ + * @Description : 条码履历Dao层接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 16:36 + * @Modify: + **/ @Repository public interface MesProduceSnTravelRepository 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 ad38b80..b598cf2 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 @@ -414,7 +414,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck,organizeCode); + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck, organizeCode); // DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean); DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean); @@ -978,9 +978,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(packSpec.getSpecName())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); } - if (!StringUtils.isEmpty(packSpec.getParentSpec())) { - DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean); - } +// if (!StringUtils.isEmpty(packSpec.getSpecCode())) { +// DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "parentSpec", packBean); +// } return packBean; } @@ -1238,6 +1238,7 @@ public class MesHqlPack { /** * 工单审批查询 + * * @param mesWorkOrder * @param organizeCode * @return @@ -1259,6 +1260,7 @@ public class MesHqlPack { /** * MES Plc设备信息配置查询条件封装 + * * @param mesPlc * @param organizeCode * @return @@ -1288,6 +1290,7 @@ public class MesHqlPack { /** * MES DB地址清单查询条件封装 + * * @param mesDatasource * @param organizeCode * @return @@ -1308,6 +1311,7 @@ public class MesHqlPack { /** * MES 设备故障处理方法查询条件封装 + * * @param mesFaultMethod * @param organizeCode * @return @@ -1328,6 +1332,7 @@ public class MesHqlPack { /** * MES 设备故障原因查询条件封装 + * * @param mesFaultCause * @param organizeCode * @return @@ -1348,6 +1353,7 @@ public class MesHqlPack { /** * MES 设备故障现象查询条件封装 + * * @param mesFaultPhenomenon * @param organizeCode * @return @@ -1368,6 +1374,7 @@ public class MesHqlPack { /** * MES 过程质量检验查询条件封装 + * * @param mesQcCheckStandard * @param organizeCode * @return From 3ab8cf112d63848e580d3a4583a2bef7646827be Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Mon, 21 Oct 2019 16:15:34 +0800 Subject: [PATCH 33/82] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=B7=AE=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java index 56e9dab..1ed0a34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java @@ -39,4 +39,7 @@ public class WmsCSOrderDetailsModel implements Serializable { @ApiParam("状态") public String wmStatus; + + @ApiParam("目标库位") + public String destLocateNo; } From e8336c85d757aa428569cd50b77d61c85c348ee3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 21 Oct 2019 16:25:37 +0800 Subject: [PATCH 34/82] =?UTF-8?q?idea=20=E5=BC=82=E5=B8=B8=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 5 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 204 ++++++++++++++++++++- 2 files changed, 198 insertions(+), 11 deletions(-) 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 2014c70..46ad0c9 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 @@ -1147,7 +1147,8 @@ public class MesEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), - ATTEMPT_ORDER(30, "试制工单"); + ATTEMPT_ORDER(30, "试制工单"), + BH_ORDER(40, "B&H工单");; private int value; private String description; @@ -1380,6 +1381,7 @@ public class MesEnumUtil { CREATE(10, "创建"), PROCESS(20, "加工"), OFFLINE(30, "下线"), + PACKAGE_SCAN(35, "打包扫描"), INSTOCKED(40, "入库"), SHIPING(50, "发运"), CLOSE(90, "关闭"), @@ -1535,6 +1537,7 @@ public class MesEnumUtil { CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), + RUNNING_INFO("runningInfo", "执行信息"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); 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 19ca8a0..34ce4d8 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 @@ -351,20 +351,20 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_CENTER_RUNNING_STATUS { - RUNNING(1, "start", "开线"), - STOPPED(2, "stop", "停线"); + RUNNING("Y", "start", "开线"), + STOPPED("N", "stop", "停线"); - private int value; + private String value; private String code; private String description; - WORK_CENTER_RUNNING_STATUS(int value, String code, String description) { + WORK_CENTER_RUNNING_STATUS(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -376,20 +376,20 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } return tmp; } - public static String valueOfCode(int val) { + public static String valueOfCode(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].code; } } @@ -855,7 +855,8 @@ public class MesPcnEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), - ATTEMPT_ORDER(30, "试制工单"); + ATTEMPT_ORDER(30, "试制工单"), + BH_ORDER(40, "B&H工单"); private int value; private String description; @@ -1405,4 +1406,187 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_SN_STATUS { + + CREATE(10, "创建"), + PROCESS(20, "加工"), + OFFLINE(30, "下线"), + PACKAGE_SCAN(35, "打包扫描"), + INSTOCKED(40, "入库"), + SHIPING(50, "发运"), + CLOSE(90, "关闭"), + ; + + private int value; + private String description; + + PRODUCE_SN_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 PACKAGE_IS_SEALED { + + UNSEALED(1, "未封箱"), + SEALED(2, "已封箱"); + + private int value; + private String description; + + PACKAGE_IS_SEALED(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 PACKAGE_OP_TYPE { + + PACK(10, "打包"), + UNPACK(20, "拆包"); + + private int value; + private String description; + + PACKAGE_OP_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; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_PRINT_STATUS { + + UNPRINTED(10, "未打印"), + PRINTED(20, "打印"); + + private int value; + private String description; + + PACKAGE_PRINT_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 STATION_BUSI_TYPE { + MESSAGE("message", "返回信息"), + STEP_LIST("stepList", "工步列表"), + STEP_CONTENT("stepContent", "工步内容"), + MODULE_CONTENT("moduleContent", "组件内容"), + CUSTOM_COMPONENT("customComponent", "定制内容"), + TASK_COMPLETE("taskComplete", "整个扫描完成"), + STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), + RUNNING_INFO("runningInfo", "执行信息"), + RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); + + + private String value; + private String description; + + STATION_BUSI_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + } From 0d0178545c99329b14ab38713883f7d6a2522391 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 21 Oct 2019 16:44:32 +0800 Subject: [PATCH 35/82] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 110 +++++++++++++++++++++ .../pojo/mes/bean/MesEquNotifyObjectCfg.java | 48 +++++++++ .../i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java | 51 ++++++++++ .../pojo/mes/model/MesEquTaskNotifyModel.java | 92 +++++++++++++++++ .../MesEquNotifyObjectCfgRepository.java | 16 +++ .../repository/MesEquTaskNotifyCfgRepository.java | 16 +++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 49 +++++++++ 7 files changed, 382 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquNotifyObjectCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskNotifyCfgRepository.java 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 46ad0c9..060c91f 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 @@ -11,6 +11,116 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class MesEnumUtil { + /** + * mes设备作业通知配置-通知类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_NOTIFY_CFG_TYPE { + + TASK_NOTIFY(10, "任务型通知"); + + private int value; + private String description; + + MES_EQU_TASK_NOTIFY_CFG_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业通知配置-通知方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN { + + EMAIL(10, "邮件"), + USERPHONE(10, "手机号"); + + private int value; + private String description; + + MES_EQU_TASK_NOTIFY_CFG_PATTERN(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备通知对象配置-对象类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_NOTIFY_OBJECT_CFG_TYPE { + + CHECK_NOTIFY_OBJECT(10, "点检通知对象"), + MAINTAIN_NOTIFY_OBJECT(20, "保养通知对象"), + REPAIR_NOTIFY_OBJECT(30, "维修通知对象"); + + private int value; + private String description; + + MES_EQU_NOTIFY_OBJECT_CFG_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } /** * mes 工位类型 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 new file mode 100644 index 0000000..0882b81 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -0,0 +1,48 @@ +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; + +/** + * @Description :设备通知对象配置 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_NOTIFY_OBJECT_CFG") +@Api("设备通知对象配置") +public class MesEquNotifyObjectCfg extends BaseBean { + @Column(name="NOTIFY_OBJECT_CODE") + @ApiParam("对象代码") + private String notifyObjectCode; + + @Column(name="NOTIFY_OBJECT_NAME") + @ApiParam("对象名称") + private String notifyObjectName; + + @Column(name="NOTIFY_OBJECT_VALUE") + @ApiParam("对象值") + private String notifyObjectValue; + + @Column(name="NOTIFY_OBJECT_TYPE") + @ApiParam("对象类型") + private Integer notifyObjectType; + +} 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 new file mode 100644 index 0000000..b47ef5d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java @@ -0,0 +1,51 @@ +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; + +/** + * @Description :设备作业通知配置 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK_NOTIFY_CFG") +@Api("设备作业通知配置") +public class MesEquTaskNotifyCfg extends BaseBean { + @Column(name="TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name="NOTIFY_TYPE") + @ApiParam("通知类型") + private Integer notifyType; + + @Column(name="NOTIFY_CONDITION") + @ApiParam("通知条件（小时）") + private Integer notifyCondition; + + @Column(name="NOTIFY_OBJECT_CODE") + @ApiParam("通知对象") + private String notifyObjectCode; + + @Column(name="NOTIFY_PATTERN") + @ApiParam("通知方式") + private Integer notifyPattern; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java new file mode 100644 index 0000000..f963452 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskNotifyModel implements Serializable { + + @ApiParam("作业任务编号") + private String taskNo; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("作业状态") + private Integer taskStatus; + + @ApiParam(value="生产线") + private String workCenterCode; + + @ApiParam("计划日期") + private String planTime; + + @ApiParam("任务来源") + private Integer taskSource; + + @ApiParam("通知标识") + private Integer notifyFlag; + + @ApiParam("关联任务") + private String relateTask; + + @ApiParam("通知类型") + private Integer notifyType; + + @ApiParam("通知条件（小时）") + private Integer notifyCondition; + + @ApiParam("通知对象") + private String notifyObjectCode; + + @ApiParam("通知方式") + private Integer notifyPattern; + + @ApiParam("对象值") + private String notifyObjectValue; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("作业状态") + private String taskStatusName; + + @ApiParam("任务来源") + private String taskSourceName; + + @ApiParam("通知标识") + private String notifyFlagName; + + @ApiParam("通知类型") + private Integer notifyTypeName; + + @ApiParam("通知方式") + private Integer notifyPatternName; + + + public MesEquTaskNotifyModel() { + + } + + public MesEquTaskNotifyModel(String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, Integer notifyFlag, String relateTask, Integer notifyType, Integer notifyCondition, String notifyObjectCode, Integer notifyPattern, String notifyObjectValue, String organizeCode) { + this.taskNo = taskNo; + this.taskType = taskType; + this.taskStatus = taskStatus; + this.workCenterCode = workCenterCode; + this.planTime = planTime; + this.taskSource = taskSource; + this.notifyFlag = notifyFlag; + this.relateTask = relateTask; + this.notifyType = notifyType; + this.notifyCondition = notifyCondition; + this.notifyObjectCode = notifyObjectCode; + this.notifyPattern = notifyPattern; + this.notifyObjectValue = notifyObjectValue; + this.organizeCode = organizeCode; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquNotifyObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquNotifyObjectCfgRepository.java new file mode 100644 index 0000000..3b33ddd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquNotifyObjectCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquNotifyObjectCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesEquNotifyObjectCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskNotifyCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskNotifyCfgRepository.java new file mode 100644 index 0000000..f97ef1b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskNotifyCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskNotifyCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesEquTaskNotifyCfgRepository 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 194d8cf..e641869 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 @@ -1400,6 +1400,7 @@ public class MesHqlPack { } /** +<<<<<<< Updated upstream * MES 缺陷查询条件封装 * @param mesDefect * @param organizeCode @@ -1439,6 +1440,54 @@ public class MesHqlPack { return packBean; } + + /** 设备通知对象配置 查询条件封装 + * @param mesEquNotifyObjectCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquNotifyObjectCfg(MesEquNotifyObjectCfg mesEquNotifyObjectCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquNotifyObjectCfg, organizeCode); + if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectCode())) { + DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectCode(), "notifyObjectCode", packBean); + } + if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectName())) { + DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectName(), "notifyObjectName", packBean); + } + if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValue())) { + DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValue", packBean); + } + if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectType())) { + DdlPreparedPack.getNumEqualPack(mesEquNotifyObjectCfg.getNotifyObjectType(), "notifyObjectType", packBean); + } + return packBean; + } + + /** 设备作业通知配置 查询条件封装 + * @param mesEquTaskNotifyCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquTaskNotifyCfg(MesEquTaskNotifyCfg mesEquTaskNotifyCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskNotifyCfg, organizeCode); + if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyObjectCode())) { + DdlPreparedPack.getStringLikerPack(mesEquTaskNotifyCfg.getNotifyObjectCode(), "notifyObjectCode", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getTaskType())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getTaskType(), "taskType", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyType())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getNotifyType(), "notifyType", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyCondition())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getNotifyCondition(), "notifyCondition", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyPattern())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getNotifyPattern(), "notifyPattern", packBean); + } + return packBean; + } + /** * MES 类型信息查询条件封装 * @param mesTypeCfg From fa25769c50cf87f6239ddb0294acc6cb4d95272a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 21 Oct 2019 17:35:47 +0800 Subject: [PATCH 36/82] =?UTF-8?q?mes=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 329 +++++++++++++++++---- 1 file changed, 278 insertions(+), 51 deletions(-) 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 060c91f..0ef45a6 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 @@ -12,6 +12,282 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes设备作业任务明细-执行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_ACTION_STATUS { + + PENDING(10, "待处理"), + COMPLETE(20, "已完成"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_ACTION_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; + } + + } + + /** + * mes设备作业任务明细-整体结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_FINAL_RESULT { + + YES(10, "合格"), + NO(20, "不合格"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业任务明细-维修标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG { + + FALSE(10, "否"), + TRUE(20, "是"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_STATUS { + + CREATE(10, "创建"), + LANDED(20, "下达"), + OPEN(30, "开启"), + CLOSE(40, "关闭"), + CANCEL(50, "取消"); + + private int value; + private String description; + + MES_EQU_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; + } + + } + + /** + * mes设备作业任务来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_SOURCE { + + PLAN(10, "周期计划"), + CREATE(20, "手工创建"), + ANDON(30, "ANDON"); + + private int value; + private String description; + + MES_EQU_TASK_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业通知标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_NOTIFY_FLAG { + + FALSE(10, "未通知"), + TRUE(20, "已通知"); + + private int value; + private String description; + + MES_EQU_TASK_NOTIFY_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes导入模块 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_INSERT_EXCEL { + + MES_PLAN_ORDER(10, "生产计划"), + MES_EQUIPMENT(20, "设备台账"), + MES_EQU_TASK_STANDARD(30, "设备作业要求"); + + private int value; + private String description; + + MES_INSERT_EXCEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_INSERT_EXCEL getByValue(int value) { + for (MES_INSERT_EXCEL mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes设备作业通知配置-通知类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -417,56 +693,7 @@ public class MesEnumUtil { * mes设备作业要求-作业类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_INSERT_EXCEL { - - MES_PLAN_ORDER(10, "生产计划"), - MES_EQUIPMENT(20, "设备台账"), - MES_EQU_TASK_STANDARD(30, "设备作业要求"); - - private int value; - private String description; - - MES_INSERT_EXCEL(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - // 根据value返回枚举类型,主要在switch中使用 - public static MES_INSERT_EXCEL getByValue(int value) { - for (MES_INSERT_EXCEL mesInsertExcel : values()) { - if (mesInsertExcel.getValue() == value) { - return mesInsertExcel; - } - } - return null; - } - - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - } - - /** - * mes设备作业要求-作业类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_STANDARD_TASK_TYPE { + public enum MES_EQU_TASK_TYPE { CHECK(10, "点检"), MAINTAIN(20, "保养"), @@ -475,7 +702,7 @@ public class MesEnumUtil { private int value; private String description; - MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) { + MES_EQU_TASK_TYPE(int value, String description) { this.value = value; this.description = description; } From 689f6057c1c56aafaafac4f4d4ae491c6ea92ac9 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 21 Oct 2019 17:48:48 +0800 Subject: [PATCH 37/82] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java | 6 ++++++ .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 3a35968..d61b983 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -154,6 +154,12 @@ public class UserDetailModel extends BaseBean { @ApiParam(value ="用户所有组织信息") private List infoOrganizeIdList; + @ApiParam(value ="账号ID集合信息") + private List userIdList; + + @ApiParam(value ="用户ID集合信息") + private List userInfoIdList; + public SysUser getSysUser(){ SysUser user = new SysUser(); user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); 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 572f63f..4e34946 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 @@ -524,10 +524,13 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(user); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); result.setOrderByStr(user.orderBy()); @@ -651,6 +654,10 @@ public class CoreHqlPack { DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); + if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ + DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); + } + // Like DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); From bdb818930bfb6002e57703ba59652e005c24fe3f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 21 Oct 2019 19:20:36 +0800 Subject: [PATCH 38/82] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonDisposalCfg.java | 8 ++ .../pojo/andon/bean/AndonDisposalMaintenCfg.java | 15 --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 8 ++ .../i3plus/pojo/andon/bean/AndonManageRecord.java | 148 ++------------------- .../i3plus/pojo/andon/bean/AndonQueueAttach.java | 8 ++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 7 +- 6 files changed, 35 insertions(+), 159 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 96463f0..2c61463 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -51,6 +51,14 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acNameRdd; + @Column(name = "EC_CODE") + @ApiParam(value = "事件方法代码") + private String ecCode; + + @Column(name = "EC_NAME_RDD") + @ApiParam(value = "事件方法描述") + private String ecNameRdd; + @AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "FLOW_STATUS") @ApiParam(value = "审批状态") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java index a0b4eed..83e1572 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java @@ -30,27 +30,12 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Api("Andon自处理维护配置") public class AndonDisposalMaintenCfg extends BaseBean { - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") - private String workCellCode; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; - @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") - private String acCode; - - @Column(name = "EM_CODE") - @ApiParam(value = "处理措施代码") - private String emCode; - @Column(name = "RP_WHERE") @ApiParam(value = "有效时长") private Integer rpWhere; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 573ca3e..6f0f112 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -250,6 +250,14 @@ public class AndonManageQueue extends BaseManageQueue { @ApiParam(value ="规格型号") private String scale; + @Transient + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Transient + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index f47728f..a5d557a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; @@ -35,116 +36,38 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯记录") -public class AndonManageRecord extends BaseBean { - - @Column(name = "ANDON_ORDER_NO") - @ApiParam(value = "安灯队列编号") - private String andonOrderNo; - - @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") - private String alarmCode; - - @Column(name = "ACTION_CODE") - @ApiParam(value = "安灯动作代码") - private String actionCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME_RDD") - @ApiParam(value = "工作中心名称") - private String workCenterNameRdd; - - @Column(name = "WORK_CELL_NAME_RDD") - @ApiParam(value = "工作单元名称") - private String workCellNameRdd; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") - private String workCellCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam(value = "设备代码") - private String equipmentCode; - - @Column(name = "EQUIPMENT_NAME_RDD") - @ApiParam(value = "设备名称") - private String equipmentNameRdd; - - @Column(name = "SHIFT_CODE") - @ApiParam(value = "班次代码") - private String shiftCode; - - @Column(name = "SHIFT_NAME_RDD") - @ApiParam(value = "班次名称") - private String shiftNameRdd; - - @Column(name = "STATUS_CODE") - @ApiParam(value = "安灯状态代码") - private String statusCode; +public class AndonManageRecord extends BaseManageQueue { @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; - @Column(name = "PRIORITY_LEVEL") - @ApiParam(value = "优先级别", example = "1") - private Integer priorityLevel; - - @Column(name="CALL_TIME",updatable = false) - @ApiParam(value = "呼叫时间") - @AnnoOutputColumn(hidden = true) - public String callTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String callTimeStr; - @Column(name="CONFIRM_TIME",updatable = false) - @ApiParam(value = "响应时间") - @AnnoOutputColumn(hidden = true) - public String confirmTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="响应时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String confirmTimeStr; - @Column(name="RESET_TIME",updatable = false) - @ApiParam(value = "解决时间") - @AnnoOutputColumn(hidden = true) - public String resetTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String resetTimeStr; - @Column(name = "CALL_USER") - @ApiParam(value = "呼叫人") - private String callUser; - @Transient @ApiParam(value = "呼叫人名字") private String callUserName; - @Column(name = "CONFIRM_USER") - @ApiParam(value = "响应人") - private String confirmUser; - @Transient @ApiParam(value = "响应人名字") private String confirmUserName; - @Column(name = "RESET_USER") - @ApiParam(value = "解决人") - private String resetUser; @Transient @ApiParam(value = "解决人名字") @@ -177,69 +100,10 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "转呼通知等级") private String scRpLevel; - @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") - private String acCode; - - @Column(name = "AC_NAME_RDD") - @ApiParam(value = "呼叫原因描述") - private String acNameRdd; - - @Column(name = "AC_DESC") - @ApiParam(value = "呼叫具体原因") - private String acDesc; - - @Column(name = "EC_CODE") - @ApiParam(value = "事件原因代码") - private String ecCode; - - @Column(name = "EC_NAME_RDD") - @ApiParam(value = "事件原因描述") - private String ecNameRdd; - - @Column(name = "EC_DESC") - @ApiParam(value = "事件具体原因") - private String ecDesc; - - @Column(name = "EM_CODE") - @ApiParam(value = "事件方法代码") - private String emCode; - - @Column(name = "EM_NAME_RDD") - @ApiParam(value = "事件方法描述") - private String emNameRdd; - - @Column(name = "EM_DESC") - @ApiParam(value = "事件具体方法") - private String emDesc; - - @Column(name = "IS_HALT") - @ApiParam(value = "是否停机", example = "1") - private Integer isHalt; - - @Column(name = "HALT_CODE") - @ApiParam(value = "停机类型") - private String haltCode; - - @Column(name = "HALT_DESC") - @ApiParam(value = "停机具体原因") - private String haltDesc; - @Column(name = "SEND_FLAG") @ApiParam(value = "发送标志") private String sendFlag; - /** - * 处理类型：10=标准处理，20=自处理 - */ - @Column(name = "DISPOSAL_TYPE") - @ApiParam(value = "处理类型") - private String disposalType; - - @Column(name = "ALARM_DETAIL_CODE") - @ApiParam(value = "安灯子类型代码") - private String alarmDetailCode; - @Column(name = "EPM_CODE") @ApiParam(value = "事件现象代码") private String epmCode; @@ -321,6 +185,14 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value ="规格型号") private String scale; + @Transient + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Transient + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index 739613c..31fda6a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -92,4 +92,12 @@ public class AndonQueueAttach extends BaseBean { @ApiParam(value ="规格型号") private String scale; + @Column(name="CURRENT_PROD_NUM") + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Column(name="TOTAL_PROD_NUM") + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index f46add5..833ebed 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -90,7 +90,7 @@ public class AndonHqlPack { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean); + DdlPreparedPack.getStringLikerPack(andonBroadCast.getTargetIds(), "targetIds", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getGroupNo(), "groupNo", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean); DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean); @@ -120,11 +120,7 @@ public class AndonHqlPack { public static DdlPackBean getAndonDisposalMaintenCfg(AndonDisposalMaintenCfg andonDisposalMaintenCfg) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getOrganizeCode(), "organizeCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getEmCode(), "emCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAcCode(), "acCode", packBean); DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean); return packBean; } @@ -138,7 +134,6 @@ public class AndonHqlPack { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonQueueAttach.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonQueueAttach.getAndonOrderNo(), "andonOrderNo", packBean); - DdlPreparedPack.getStringEqualPack(andonQueueAttach.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean); return packBean; } From dbc69e957a33bd97572ca3bf077f4c4ca30a3afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 21 Oct 2019 20:58:45 +0800 Subject: [PATCH 39/82] =?UTF-8?q?1.=20=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=AE=9E=E4=BD=93=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 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index 82a5a73..3d90a3d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -38,6 +38,9 @@ public class WmsVendorPart extends BaseBean { @ApiParam(value = "物料号") private String partNo; + @Column(name = "VENDOR_PART_NO") + @ApiParam(value = "供应商物料号") + private String vendorPartNo; @Transient @ApiParam("物料名称") From fa4f58ec6c9195989259bc1c1230e32d6e816bf7 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 21 Oct 2019 21:20:46 +0800 Subject: [PATCH 40/82] =?UTF-8?q?pom=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-aps/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4426ba9..8a9ed9f 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 From 081d792b983fa1230a8c3776e57fe9cf7f207e1c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 21 Oct 2019 21:51:19 +0800 Subject: [PATCH 41/82] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/EquTaskNotifyUserModel.java | 57 ++++++++++++++++++++++ .../pojo/mes/model/MesEquTaskNotifyModel.java | 6 ++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java new file mode 100644 index 0000000..d93bbd5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : 设备任务通知人员model + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-10-11 11:02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("用户信息model") +public class EquTaskNotifyUserModel extends BaseBean { + + @ApiParam(value ="人员ID") + private Long userId; + + @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_EMAIL") + @ApiParam(value ="邮箱" , access ="邮箱") + private String userEmail; + + @Column(name="USER_PHONE") + @ApiParam(value ="手机号" , access ="手机号") + private String userPhone; + + @Column(name="USER_STATUS") + @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + private Integer userStatus; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java index f963452..4ad0500 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskNotifyModel.java @@ -8,6 +8,9 @@ import java.io.Serializable; @Data public class MesEquTaskNotifyModel implements Serializable { + @ApiParam("id") + private Long id; + @ApiParam("作业任务编号") private String taskNo; @@ -73,7 +76,8 @@ public class MesEquTaskNotifyModel implements Serializable { } - public MesEquTaskNotifyModel(String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, Integer notifyFlag, String relateTask, Integer notifyType, Integer notifyCondition, String notifyObjectCode, Integer notifyPattern, String notifyObjectValue, String organizeCode) { + public MesEquTaskNotifyModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, Integer notifyFlag, String relateTask, Integer notifyType, Integer notifyCondition, String notifyObjectCode, Integer notifyPattern, String notifyObjectValue, String organizeCode) { + this.id = id; this.taskNo = taskNo; this.taskType = taskType; this.taskStatus = taskStatus; From 5c67a7bb5f9b2c2668b84e02124cc2ce842be077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 22 Oct 2019 09:57:54 +0800 Subject: [PATCH 42/82] =?UTF-8?q?MySQL=20=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=20CAST=20AS=20DOUBLE=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=94=B9=E6=88=90=20CAST=20AS=20DECIMAL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f05d963..70ea929 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 @@ -636,7 +636,7 @@ public class DdlPreparedPack { if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) { name = " cast(" + name + " as integer)"; } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) { - name = " cast(" + name + " as double)"; + name = " cast(" + name + " as decimal)"; } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) { name = " cast(" + name + " as long)"; } From ac7b0415ba47eb500e79ffd1fca153c07e457327 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 22 Oct 2019 10:23:59 +0800 Subject: [PATCH 43/82] =?UTF-8?q?1083=20=E6=B7=BB=E5=8A=A0=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) 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 0ef45a6..893994e 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 @@ -2253,4 +2253,50 @@ public class MesEnumUtil { } } + /** + * MesRoute 流程的类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_TYPE { + + SCAN(10, "扫描流程"), + MONITOR(20, "监控流程"); + + private int value; + private String description; + + ROUTE_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 String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + } From 901e37d6e76b5f37e184adb09f753c9de76b6f81 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 22 Oct 2019 14:57:39 +0800 Subject: [PATCH 44/82] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 2c61463..ffdeef2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -51,13 +51,13 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acNameRdd; - @Column(name = "EC_CODE") + @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") - private String ecCode; + private String emCode; - @Column(name = "EC_NAME_RDD") + @Column(name = "EM_NAME_RDD") @ApiParam(value = "事件方法描述") - private String ecNameRdd; + private String emNameRdd; @AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "FLOW_STATUS") From a54d711d95717b261a4917e0a6162d123a94d3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 22 Oct 2019 15:44:34 +0800 Subject: [PATCH 45/82] =?UTF-8?q?#1085=20BOM=E5=AF=BC=E5=85=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java new file mode 100644 index 0000000..2ef6b8c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java @@ -0,0 +1,71 @@ +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; +import lombok.Data; + +/** +* @Description : 物料清单模板 +* @Reference : +* @author: jessica.chen +* @date: 2019/10/22 17:10 +* @Modify: +*/ + +@Data +@Api(value="领料单模板",description = "领料单模板") +public class WmsBomTemplate extends BaseBean { + + private static final long serialVersionUID = 2167743108452607611L; + + @ApiParam(value = "父物料号") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "父物料描述") + @AnnoOutputColumn + private String partName; + + @ApiParam(value = "父计量单位") + @AnnoOutputColumn + private String unit; + + @ApiParam(value = "父级数量") + @AnnoOutputColumn + private Double qty; + + @ApiParam(value = "子物料号") + @AnnoOutputColumn + private String itemPartNo; + + @ApiParam(value = "子物料描述") + @AnnoOutputColumn + private String itemPartName; + + @ApiParam(value = "子计量单位") + @AnnoOutputColumn + private String itemUnit; + + @ApiParam(value = "子用量") + @AnnoOutputColumn + private Double itemQty; + + @ApiParam(value = "BOM编号") + @AnnoOutputColumn + private String bomNum; + + @ApiParam(value = "BOM版本号") + @AnnoOutputColumn + private String bomVersion; + + @ApiParam(value = "有效起始日期") + @AnnoOutputColumn + private String effStartTime; + + @ApiParam(value = "有效截止日期") + @AnnoOutputColumn + private String effEndTime; + +} From a9045ed4038a501fdb1e06fbc9a20f19ac645d95 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 22 Oct 2019 16:05:35 +0800 Subject: [PATCH 46/82] bug 5953 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 1477d82..b2c81ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -116,6 +116,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam("集装箱号") public String containerNo; + @Column(name = "PRIOR_RC") + @ApiParam("预收货") + public Integer priorRC; + @Transient @ApiParam(value = "工厂名称") public String organizeName; 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 6d3a0dd..46d6355 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 @@ -2383,8 +2383,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); - DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); + DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result); // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRouting, result); From 07749b50ec532a8a74b989d9b5091f0aa580edc0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 22 Oct 2019 20:27:28 +0800 Subject: [PATCH 47/82] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1086=EF=BC=8C?= =?UTF-8?q?=20mes=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 6 +- .../pojo/mes/bean/MesEquTaskStandardRecord.java | 73 ++++++++++++++++++++++ .../pojo/mes/model/MesEquTaskDetailModel.java | 8 +++ .../MesEquTaskStandardRecordRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +++++++ 5 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.java 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 52022c0..8ad11ab 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 @@ -40,7 +40,7 @@ public class MesEquTask extends BaseBean { private Integer taskType; @Column(name = "TASK_STATUS") - @ApiParam("作业状态") + @ApiParam("任务状态") private Integer taskStatus; @Column(name = "WORK_CENTER_CODE") @@ -80,6 +80,10 @@ public class MesEquTask extends BaseBean { private String planTimeEnd; @Transient + @ApiParam(value = "用于设备点检保养维修作业页面开窗查询任务，点检保养=1，维修=2") + private String pageType; + + @Transient @ApiParam(value ="明细列表") private List mesEquTaskDetailList; 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 new file mode 100644 index 0000000..651fd4d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -0,0 +1,73 @@ +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; + +/** + * @Description :设备点检保养作业记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_TASK_STANDARD_RECORD") +@Api("设备点检保养作业记录") +public class MesEquTaskStandardRecord extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name = "TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @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 = "CHECK_RESULT") + @ApiParam("判定结果") + private Integer checkResult; + + @Column(name = "FINAL_RESULT") + @ApiParam("整体结果") + private Integer finalResult; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java index e870983..febc640 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskStandardRecord; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; @Data public class MesEquTaskDetailModel implements Serializable { @@ -70,6 +72,12 @@ public class MesEquTaskDetailModel implements Serializable { @ApiParam("作业类型") private String taskTypeName; + @ApiParam("设备点检保养记录修改标识") + private Boolean isUpdate; + + @ApiParam("设备点检保养记录") + private List equTaskStandardRecordList; + public MesEquTaskDetailModel() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.java new file mode 100644 index 0000000..97fdb8f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskStandardRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskStandardRecordRepository 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 e641869..6887621 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 @@ -1530,4 +1530,27 @@ public class MesHqlPack { } return packBean; } + + /** + * 按条件分页查询mes设备点检保养维修作业 + * @param mesEquTaskDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquTaskDetailByTaskNo(MesEquTaskDetail mesEquTaskDetail, String organizeCode) { + DdlPackBean packBean = getMesAllData(organizeCode); + if (!StringUtils.isEmpty(mesEquTaskDetail.getTaskNo())) { + DdlPreparedPack.getStringEqualPack(mesEquTaskDetail.getTaskNo(), "taskNo", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskDetail.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquTaskDetail.getEquipmentCode(), "equipmentCode", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskDetail.getActionStatus())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getActionStatus(), "actionStatus", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskDetail.getFinalResult())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getFinalResult(), "finalResult", packBean); + } + return packBean; + } } From 5956d5a08e3f7bf55054b0530e2ef8a954877b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 22 Oct 2019 21:29:52 +0800 Subject: [PATCH 48/82] =?UTF-8?q?=E5=86=B2=E9=94=80=EF=BC=9A=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java | 5 +++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 8 -------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java index bc8af3b..fce57f7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; import lombok.Data; import java.io.Serializable; @@ -18,5 +18,6 @@ public class WmsWriteOffModel implements Serializable { private static final long serialVersionUID = -5490167040159056107L; private String locateNo; private List snList; - private List summaryList; + private List summaryList; + private String organizeCode; } 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 0cd2e2f..76aad42 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 @@ -225,7 +225,12 @@ public class WmsMoveDetails extends BaseBean { public Long getFinishedCounts() { return finishedCounts == null ? 0L : this.finishedCounts; } - + public WmsMoveDetails(String partNo, String partNameRdd, String unit, Double transQty) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.transQty = transQty; + } public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty, String createDateTime, String sn, String srcZoneNo) { this.organizeCode = organizeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index f4fdad9..de05dbf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -202,14 +202,6 @@ public class WmsMoveSn extends BaseBean { public WmsMoveSn() { } - public WmsMoveSn(String partNo, String partNameRdd, String unit, String lotNo, Double qty) { - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.unit = unit; - this.lotNo = lotNo; - this.qty = qty; - } - public Long getWaitingCounts() { return waitingCounts == null ? 0L : this.waitingCounts; } From 25f11781c1d87e90c03b1239dd8396eeef9cf429 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Wed, 23 Oct 2019 09:17:18 +0800 Subject: [PATCH 49/82] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82?= =?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 --- .../cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java index 1ed0a34..9a5fb95 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java @@ -34,9 +34,15 @@ public class WmsCSOrderDetailsModel implements Serializable { @ApiParam("仓库编码") public String whNo; + @ApiParam("源仓库编码") + public String srcWhNo; + @ApiParam("区域编码") public String zoneNo; + @ApiParam("源存储区编码") + public String srcZoneNo; + @ApiParam("状态") public String wmStatus; From e8f8c941c9aa00f3114aef2676464e47f92f43ca Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 23 Oct 2019 10:29:57 +0800 Subject: [PATCH 50/82] =?UTF-8?q?LAC=20=E6=8C=87=E4=BB=A4=E9=9B=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8BCRUD=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90=20LA?= =?UTF-8?q?C=20=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8BCRUD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-lac/pom.xml | 6 ++ .../pojo/lac/bean/LacCommandStackRecord.java | 91 ++++++++++++++++++ .../i3plus/pojo/lac/bean/LacCommandStackType.java | 44 +++++++++ .../cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 106 +++++++++++++++++++++ .../i3plus/pojo/lac/bean/LacLogTaskDetail.java | 94 ++++++++++++++++++ .../cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java | 42 ++++++++ .../LacCommandStackRecordRepository.java | 14 +++ .../repository/LacCommandStackTypeRepository.java | 15 +++ .../lac/repository/LacLogTaskDetailRepository.java | 15 +++ .../pojo/lac/repository/LacLogTaskRepository.java | 15 +++ .../pojo/lac/repository/LacTaskTypeRepository.java | 15 +++ .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 47 +++++++++ 12 files changed, 504 insertions(+) create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3681eb6..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -13,5 +13,11 @@ i3plus-pojo-lac jar + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java new file mode 100644 index 0000000..4a864be --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.lac.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-18 下午6:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_RECORD") +@Api(value="适配记录",description = "适配记录") +public class LacCommandStackRecord extends BaseBean { + + private static final long serialVersionUID = -2775980024345181459L; + + @Column(name="commandStackId") + @ApiParam(value ="指令集ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackId; + + @Column(name="COMMAND_STACK_NAME_RDD") + @ApiParam(value ="指令集名称") + private String commandStackNameRdd; + + @Column(name="COMMAND_STACK_CODE_RDD") + @ApiParam(value ="指令集代码") + private String commandStackCodeRdd; + + @Column(name="COMMAND_STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTypeId; + + @Column(name="STEP_INDEX") + @ApiParam(value ="当前步骤") + private Integer stepIndex; + + @Column(name="STEP_NUM") + @ApiParam(value ="步骤总数") + private Integer stepNum; + + @Column(name="TASK_COMPLETE_NUM") + @ApiParam(value ="任务完成数量") + private Integer taskCompleteNum; + + @Column(name="TASK_NUM") + @ApiParam(value ="任务总数") + private Integer taskNum; + + @Lob + @Column(name="INPUT_PARAMETER") + @ApiParam(value ="执行入参") + private String inputParameter; + + @Column(name="STACK_START_TIME") + @ApiParam(value ="执行开始时间") + private String stackStartTime; + + @Column(name="STACK_END_TIME") + @ApiParam(value ="执行结束时间") + private String stackEndTime; + + @Column(name="STACK_SPEND") + @ApiParam(value ="执行耗时") + private Integer stackSpend; + + @Column(name="STACK_STATUS") + @ApiParam(value ="执行状态") + private Integer stackStatus; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java new file mode 100644 index 0000000..431e878 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.lac.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 : wei.peng + * @CreateDate : 19-10-22 下午3:29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_INSTRUCTION_TYPE") +@Api(value="指令集类型",description = "指令集类型") +public class LacCommandStackType extends BaseBean { + + + @Column(name="TYPE_NAME") + @ApiParam(value ="类型名称") + private String typeName; + + @Column(name="TYPE_REF_NUM") + @ApiParam(value ="适配器使用数量") + private Integer typeRefNum; + + @Column(name="TYPE_DESCRIPTION") + @ApiParam(value ="类型描述") + private String typeDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java new file mode 100644 index 0000000..daab86e --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -0,0 +1,106 @@ +package cn.estsh.i3plus.pojo.lac.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-18 下午6:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_LOG_TASK") +@Api(value="适配任务记录",description = "适配任务记录") +public class LacLogTask extends BaseBean { + + private static final long serialVersionUID = 674009105885048131L; + @Column(name="commandStackId") + @ApiParam(value ="指令集ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackId; + + @Column(name="COMMAND_STACK_NAME_RDD") + @ApiParam(value ="指令集名称") + private String commandStackNameRdd; + + @Column(name="COMMAND_STACK_CODE_RDD") + @ApiParam(value ="指令集代码") + private String commandStackCodeRdd; + + @Column(name="COMMAND_STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTypeId; + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; + + @Column(name="STEP_NAME_RDD") + @ApiParam(value ="步骤名称") + private String stepNameRdd; + + @Column(name="STEP_SEQUENCE") + @ApiParam(value ="步骤顺序") + private String stepSequence; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_NAME_TYPE") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskNameType; + + @Column(name="adapterId") + @ApiParam(value ="适配器ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long adapterId; + + @Lob + @Column(name="INPUT_PARAMETER") + @ApiParam(value ="任务入参") + private String inputParameter; + + @Column(name="TASK_START_TIME") + @ApiParam(value ="任务开始时间") + private String taskStartTime; + + @Column(name="TASK_END_TIME") + @ApiParam(value ="任务结束时间") + private String taskEndTime; + + @Column(name="TASK_SPEND") + @ApiParam(value ="任务耗时") + private Integer taskSpend; + + @Column(name="TASK_STATUS") + @ApiParam(value ="任务状态") + private Integer taskStatus; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java new file mode 100644 index 0000000..3a3f05e --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.lac.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-18 下午6:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_LOG_TASK_DETAIL") +@Api(value="适配任务记录明细",description = "适配任务记录明细") +public class LacLogTaskDetail extends BaseBean { + + + private static final long serialVersionUID = -4918694502072594064L; + @Column(name="commandStackId") + @ApiParam(value ="指令集ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackId; + + @Column(name="COMMAND_STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTypeId; + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_TYPE") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskNameType; + + @Column(name="adapterId") + @ApiParam(value ="适配器ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long adapterId; + + @Column(name="TASK_START_TIME") + @ApiParam(value ="任务开始时间") + private String taskStartTime; + + @Column(name="TASK_END_TIME") + @ApiParam(value ="任务结束时间") + private String taskEndTime; + + @Lob + @Column(name="INPUT_PARAMETER") + @ApiParam(value ="任务入参") + private String inputParameter; + + @Lob + @Column(name="INPUT_PARAMETER_BODY") + @ApiParam(value ="任务入参处理完成后") + private String inputParameterBody; + + @Lob + @Column(name="OUTPUT_PARAMETER") + @ApiParam(value ="任务出参") + private String outputParameter; + + @Lob + @Column(name="OUTPUT_PARAMETER_BODY") + @ApiParam(value ="任务出参处理后") + private String outputParameterBody; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java new file mode 100644 index 0000000..688f8ec --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.lac.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 : wei.peng + * @CreateDate : 19-10-22 下午3:32 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_TASK_TYPE") +@Api(value="任务类型",description = "任务类型") +public class LacTaskType extends BaseBean { + + @Column(name="TASK_NAME") + @ApiParam(value ="类型名称") + private String taskName; + + @Column(name="TASK_REF_NUM") + @ApiParam(value ="适配器使用数量") + private Integer taskRefNum; + + @Column(name="TASK_DESCRIPTION") + @ApiParam(value ="类型描述") + private String taskDescription; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java new file mode 100644 index 0000000..f19b6af --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + **/ +public interface LacCommandStackRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java new file mode 100644 index 0000000..fc85fd6 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacCommandStackTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java new file mode 100644 index 0000000..cd6e570 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacLogTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java new file mode 100644 index 0000000..846acec --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacLogTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java new file mode 100644 index 0000000..9cddec2 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacTaskType; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacTaskTypeRepository extends BaseRepository { +} 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 new file mode 100644 index 0000000..2c5dbff --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.lac.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.lac.bean.*; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:34 + * @Modify: + **/ +public class LacHqlPack { + + private LacHqlPack() { + } + + public static DdlPackBean packHqlLacTaskType(LacTaskType bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacLogTask(LacLogTask bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } +} From 5e78c31a708d143ad05c8b97ce1a417d29d1a481 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 23 Oct 2019 10:34:22 +0800 Subject: [PATCH 51/82] =?UTF-8?q?LAC=20=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0294208..8f92da4 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 @@ -31,7 +31,7 @@ public class CommonEnumUtil { JOBFLOW(23,"block-jobflow","智能作业流"), SOFTSWITCH(24,"block-softswitch","软件适配器"), HARDSWITCH(25,"block-hardswitch","硬件适配器"), - LAC(26,"link-connect","连接适配器"), + LAC(26,"lac","连接适配器"), ANDON(27,"andon","安灯"), CENTER(99,"icloud-server","注册中心"), SURFACE(98,"i3surface","对外服务"), From 6816c7b5661f235d0f65141d4ee13ed112e152f6 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 23 Oct 2019 10:49:47 +0800 Subject: [PATCH 52/82] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E7=94=9F=E4=BA=A7=E6=97=B6=E9=97=B4=E7=9A=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/bean/AssistResourceSetTime.java | 22 ++++ .../estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 22 ++++ .../cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 28 +++++ .../i3plus/pojo/aps/bean/MaterialSetTime.java | 22 ++++ .../estsh/i3plus/pojo/aps/bean/OperResource.java | 8 +- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 36 ++++--- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 83 +++++++++++++-- .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 8 +- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 118 +++++++++++++++++++++ .../i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java | 7 ++ .../i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java | 7 ++ .../i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java | 18 ++++ .../i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java | 7 ++ .../i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java | 1 - .../i3plus/pojo/aps/enums/WORK_SORT_RULE.java | 1 - .../i3plus/pojo/aps/holders/EFurnacePlan.java | 5 + .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 7 +- .../AssistResourceSetTimeRepository.java | 9 ++ .../aps/repository/DynamicSetTimeRepository.java | 9 ++ .../pojo/aps/repository/FurnacePlanRepository.java | 9 ++ .../aps/repository/MaterialSetTimeRepository.java | 9 ++ .../src/main/resources/relations/FurnacePlan.xml | 5 + .../src/main/resources/relations/Work.xml | 2 + .../src/main/resources/relations/WorkPlan.xml | 8 +- 24 files changed, 414 insertions(+), 37 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java new file mode 100644 index 0000000..000001d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :动态设置时间与副资源相关的配置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-22 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_ASSIST_RESOURCE_SET_TIME") +@Api("副资源设置时间") +public class AssistResourceSetTime extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java new file mode 100644 index 0000000..60a6f84 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :动态设置时间设置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-22 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_DYNAMIC_SET_TIME") +@Api("动态设置时间") +public class DynamicSetTime extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java new file mode 100644 index 0000000..0d0a2fa --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :炉资源计划信息，用来关联组在一起的工作计划 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="APS_FURNACE_PLAN") +@Api("炉资源计划") +public class FurnacePlan extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java new file mode 100644 index 0000000..7ec01f9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :动态设置时间与物料相关的配置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-22 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_MATERIAL_SET_TIME") +@Api("物料设置时间") +public class MaterialSetTime extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 4957a0e..483dac0 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 @@ -35,9 +35,9 @@ public class OperResource extends BaseAPS { @ApiParam(value ="前设置时间") private String prevTime; - @Column(name="MANUF_TIME") + @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - private String manufTime; + private String produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") @@ -47,9 +47,9 @@ public class OperResource extends BaseAPS { @ApiParam(value ="最大前设置中断时间") private String maxPrevSdTime; - @Column(name="MAX_MANUF_SD_TIME") + @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") - private String maxManufSdTime; + private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") 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 5949b15..2a95d89 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS; +import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE; import io.swagger.annotations.Api; @@ -48,37 +49,37 @@ public class Resource extends BaseCode { @ApiParam(value ="后缓冲时间") private String postBuffer; - @Column(name="MAX_MANUF_BATCH") + @Column(name="MAX_PRODUCE_BATCH") @ApiParam(value ="最大生产批量") - private Double maxManufBatch; + private Double maxProduceBatch; - @Column(name="MANUF_ADJ_UNIT_TM") - @ApiParam(value ="生产时间尾数调整") - private String manufAdjUnitTm; + @Column(name="TIME_TAIL_ADJUST") + @ApiParam(value ="时间尾数调整") + private String timeTailAdjust; - @Column(name="MANUF_ADJ_UNIT") - @ApiParam(value ="生产时刻尾数调整") - private String manufAdjUnit; + @Column(name="TIME_ADJUST") + @ApiParam(value ="时间调整") + private String timeAdjust; @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") private String maxPrevSdTime; - @Column(name="MAX_MANUF_SD_TIME") + @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") - private String maxManufSdTime; + private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") private String maxPostSdTime; @Column(name="ROUND_TYPE") - @ApiParam(value ="时间圆整类型") + @ApiParam(value ="时间与时间尾数圆整类型") private TIME_ROUND_TYPE roundType; - @Column(name="MANUF_EFFECT") - @ApiParam(value ="生产效率影响") - private Integer manufEffect; + @Column(name="EFFICIENCY_EFFECT") + @ApiParam(value ="效率影响类型") + private Integer EfficiencyEffect; @Column(name="TIME_ROUND") @ApiParam(value ="时间圆整影响") @@ -88,4 +89,11 @@ public class Resource extends BaseCode { @ApiParam(value ="时间尾数影响") private Integer timeTailRound; + @Column(name="LOCK_TYPE") + @ApiParam(value ="锁定类型") + private RESOURCE_LOCK_TYPE lockType; + + @Column(name="LOCK_TIME") + @ApiParam(value ="锁定时间长度") + private String lockTime; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 546b590..08be72e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -5,14 +5,17 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; 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.util.Date; +import java.util.List; /** * @Description :工作计划 @@ -29,24 +32,70 @@ import java.util.Date; @Table(name="APS_WORK_PLAN") @Api("工作计划") public class WorkPlan extends BaseAPS { - private Date prevSetStart; + @Column(name="PREV_SET_BEGIN") + @ApiParam(value ="前设置开始时间") + private Date prevSetBegin; + + @Column(name="PREV_SET_END") + @ApiParam(value ="前设置结束时间") private Date prevSetEnd; - private String prevSetTime; - private Date produceStart; + + @Column(name="PREV_SET_TIME") + @ApiParam(value ="前设置时间") + private Long prevSetTime; + + @Column(name="PRODUCE_BEGIN") + @ApiParam(value ="生产开始时间") + private Date produceBegin; + + @Column(name="PRODUCE_END") + @ApiParam(value ="生产结束时间") private Date produceEnd; - private String produceTime; - private Date postSetStart; + + @Column(name="PRODUCE_TIME") + @ApiParam(value ="生产时间") + private Long produceTime; + + @Column(name="POST_SET_BEGIN") + @ApiParam(value ="后设置开始时间") + private Date postSetBegin; + + @Column(name="POST_SET_END") + @ApiParam(value ="后设置结束时间") private Date postSetEnd; - private String postSetTime; - private Date lockStart; + + @Column(name="POST_SET_TIME") + @ApiParam(value ="后设置时间") + private Long postSetTime; + + @Column(name="LOCK_BEGIN") + @ApiParam(value ="锁定开始时间") + private Date lockBegin; + + @Column(name="LOCK_END") + @ApiParam(value ="锁定结束时间") private Date lockEnd; - private String lockTime; - private Date edgeTime; + @Column(name="LOCK_TIME") + @ApiParam(value ="锁定时间") + private Long lockTime; + @Column(name="WORK_ID") + @ApiParam(value ="工作对象id") private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源对象id") private Long resourceId; + @Column(name="WORK_RESOURCE_ID") + @ApiParam(value ="工作资源对象id") + private Long workResourceId; + + @Column(name="MAIN_PLAN_ID") + @ApiParam(value ="主计划对象id") + private Long mainPlanId; + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { @@ -60,4 +109,20 @@ public class WorkPlan extends BaseAPS { this.resourceId = resource != null ? resource.getId() : 0l; BeanRelation.set(this, EWorkPlan.Resource, resource); } + + public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); } + + public void setWorkResource(WorkResource workResource) { + this.workResourceId = workResource != null ? workResource.getId() : 0l; + BeanRelation.set(this, EWorkPlan.WorkResource, workResource); + } + + public WorkPlan getMainPlan() { return BeanRelation.get(this, EWorkPlan.MainPlan); } + + public void setMainPlan(WorkPlan plan) { + this.mainPlanId = plan != null ? plan.getId() : 0l; + BeanRelation.set(this, EWorkPlan.MainPlan, plan); + } + + public List getAssPlans() { return BeanRelation.list(this, EWorkPlan.AssPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index d500003..f4266ec 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -34,9 +34,9 @@ public class WorkResource extends BaseAPS { @ApiParam(value ="前设置时间") private Long prevTime; - @Column(name="MANUF_TIME") + @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") - private Long manufTime; + private Long produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") @@ -50,9 +50,9 @@ public class WorkResource extends BaseAPS { @ApiParam(value ="最大前设置中断时间") private String maxPrevSdTime; - @Column(name="MAX_MANUF_SD_TIME") + @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大制造中断时间") - private String maxManufSdTime; + private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 6c7e206..86df02c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -69,6 +69,13 @@ public class BeanRelation { return temp; } + /** + * 获取关联对象 + * @param bean 实体对象 + * @param holder 关联路径 + * @param 返回关联对象的实体类型 + * @return 若存在多个关联则只取第一个。 + */ public static T get(BaseBean bean, Enum holder) { List beans = (List)get(bean).get(holder); if (beans == null || beans.isEmpty()) { @@ -77,10 +84,27 @@ public class BeanRelation { return beans.get(0); } + /** + * 获取关联对象 + * @param bean 实体对象 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 若存在多个关联则只取第一个。 + */ public static T get(BaseBean bean, Enum holder, Enum... args) { return get(bean, null, holder, args); } + /** + * 根据筛选条件获取关联对象 + * @param bean 实体对象 + * @param pred Lambda表达式，用来筛选关联对象，返回true则符合筛选条件 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 只找第一个符合筛选条件的关联对象。 + */ public static T get(BaseBean bean, Predicate pred, Enum holder, Enum... args) { List nextBeans = list(bean, holder); for (BaseBean nextEntity : nextBeans) { @@ -111,6 +135,13 @@ public class BeanRelation { return null; } + /** + * 获取关联对象集合 + * @param bean 实体对象 + * @param holder 关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合非拷贝的，外界不能对其修改。 + */ public static List list(BaseBean bean, Enum holder) { List beans = (List)get(bean).get(holder); if (beans == null) { @@ -119,10 +150,27 @@ public class BeanRelation { return beans; } + /** + * 获取关联对象集合 + * @param bean 实体对象 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合为拷贝的，外界可以对其修改。 + */ public static List list(BaseBean bean, Enum holder, Enum... args) { return list(bean, null, holder, args); } + /** + * 获取符合筛选条件的关联对象集合 + * @param bean 实体对象 + * @param pred Lambda筛选表达式，返回true为筛选出来的对象。 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合为拷贝的，外界可以对其修改。 + */ public static List list(BaseBean bean, Predicate pred, Enum holder, Enum... args) { List result = new ArrayList<>(); List nextBeans = list(bean, holder); @@ -157,6 +205,38 @@ public class BeanRelation { } } + public static List lastList(BaseBean entity, Enum... args) { + List result = new ArrayList(); + lastListImpl(result, entity, null, args, 0); + return result; + } + + public static List lastList(BaseBean entity, Predicate filter, Enum... args) { + List result = new ArrayList(); + lastListImpl(result, entity, filter, args, 0); + return result; + } + + @SuppressWarnings("unchecked") + private final static boolean lastListImpl(List result, BaseBean entity, Predicate filter, + Enum[] args, int index) { + if (index >= args.length) { + index = 0; + } + + boolean bNotLast = true; + List relaEntities = list(entity, args[index]); + for (BaseBean relaEntity : relaEntities) { + if (lastListImpl(result, relaEntity, filter, args, index + 1)) { + result.add((T)relaEntity); + bNotLast = false; + } + } + return index == 0 && bNotLast; + } + + + /** * 设值两个对象之间的关联 * @@ -282,4 +362,42 @@ public class BeanRelation { } } } + + /** + * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 + * @param bean + * @param fun + * @param holders + * @param + */ + public static void recursion(BaseBean bean, Predicate fun, Enum... holders) { + if (holders.length == 0) { + return; + } + recursionImpl(bean, fun, holders, 0); + } + + /** + * 按指定路径，递归调用实现。采用广度优先搜索。 + * @param bean + * @param fun + * @param holders + * @param index + * @param + */ + @SuppressWarnings("unchecked") + private final static void recursionImpl(BaseBean bean, Predicate fun, + Enum[] holders, int index) { + if (index >= holders.length) { + if (!fun.test((T) bean)) { + return; + } + index = 0; + } + + List relaBeans = list(bean, holders[index]); + for (BaseBean relaBean : relaBeans) { + recursionImpl(relaBean, fun, holders, index + 1); + } + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java new file mode 100644 index 0000000..acf8ac8 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum DYNAMIC_SET_CALC { + MIN, // 取最小值 + MAX, // 取最大值 + SUM // 求和 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java new file mode 100644 index 0000000..0453942 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum DYNAMIC_SET_TYPE { + PREV_SET, // 只对前设置影响 + POST_SET, // 只对后设置影响 + ALL // 对前后设置都产生影响 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java new file mode 100644 index 0000000..40f73ba --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum EFFICIENCY_EFFECT { + NONE(0), + PREV_SET(1), + PRODUCE(2), + POST_SET(4); + + private int _value; + + EFFICIENCY_EFFECT(int value){ + _value = value; + } + + public int value() { + return this._value; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java new file mode 100644 index 0000000..cb37621 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum RESOURCE_LOCK_TYPE { + NONE, // 不锁定 + PRODUCE_BEGIN, // 与后工序生产开始时刻有关 + PRODUCE_END // 与后工序生产结束时刻有关 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java index b9d7cc3..0233691 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java @@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums; * @Modify: **/ public enum TIME_ROUND_TYPE { - NONE, // 不圆整 UP, // 向上 DOWN, // 向下 ROUNDING // 四舍五入 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java index 99a6d77..bdaa913 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java @@ -15,7 +15,6 @@ public enum WORK_SORT_RULE { ORDER_COUNT, // 订单数量 ORDER_RECEIVE_DATE,// 订单接单日期 ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差 - ORDER_PRESSURE, // 订单紧迫程度 ORDER_SURPLUS, // 订单余裕度 NOPLAN_OPERATION_SIZE,// 残留工序数 REMAIN_PRODUCE_TIME, // 残留生产时间 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java new file mode 100644 index 0000000..098fa63 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EFurnacePlan { + WorkPlans +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index f288a42..490bddc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -3,5 +3,10 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EWorkPlan { Work, Resource, - AssPlans // 关联的为副资源的工作计划 + WorkResource, + MainPlan, // 关联的为主资源的工作计划 + AssPlans, // 关联的为副资源的工作计划 + PrevPlan, + PostPlan, + FurnacePlan, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java new file mode 100644 index 0000000..090a521 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.AssistResourceSetTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface AssistResourceSetTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java new file mode 100644 index 0000000..3a6d491 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.DynamicSetTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface DynamicSetTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java new file mode 100644 index 0000000..b86b0c3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface FurnacePlanRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java new file mode 100644 index 0000000..6a7bb51 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.MaterialSetTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MaterialSetTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml new file mode 100644 index 0000000..49f17bd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index bd8ea37..ef8abd5 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -12,6 +12,8 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 219bf07..7569fa1 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -1,9 +1,11 @@ - - - + + + + + \ No newline at end of file From 6b9c7b3ced7545d011570072ddd885abcce8f864 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 23 Oct 2019 15:28:43 +0800 Subject: [PATCH 53/82] =?UTF-8?q?=E3=80=90VDA=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=9B=98=E7=82=B9=E3=80=91=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 12 ++++++++---- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) 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 a1832ae..85d93c7 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 @@ -107,6 +107,10 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("是否范围内") public Integer isScope; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + @Transient @ApiParam(value = "实盘箱数", example = "1") public Long countBoxQty; @@ -163,9 +167,9 @@ public class WmsCSFactTrans extends BaseBean { this.zoneNo = zoneNo; this.partNo = partNo; this.partNameRdd = partNameRdd; - + } - - - + + + } 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 5addb05..bcbb261 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 @@ -101,6 +101,10 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.CS_TRANS_STATUS.class,refForeignKey = "value",value = "description") public Integer transStatus; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + @Transient @ApiParam(value = "实盘数量", example = "1") public Double factQty; From d5a45176d07855ed5fad0f433fc5fb22d18db211 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 23 Oct 2019 17:24:09 +0800 Subject: [PATCH 54/82] =?UTF-8?q?LAC=20=E4=BB=BB=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=8C=87=E4=BB=A4=E9=9B=86=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=20=E5=AF=B9=E8=B1=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java index 431e878..c08c908 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="LAC_INSTRUCTION_TYPE") +@Table(name="LAC_COMMAND_STACK_TYPE") @Api(value="指令集类型",description = "指令集类型") public class LacCommandStackType extends BaseBean { diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java index 688f8ec..32a5f3c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java @@ -28,15 +28,15 @@ import javax.persistence.Table; @Api(value="任务类型",description = "任务类型") public class LacTaskType extends BaseBean { - @Column(name="TASK_NAME") + @Column(name="TYPE_NAME") @ApiParam(value ="类型名称") - private String taskName; + private String typeName; - @Column(name="TASK_REF_NUM") + @Column(name="TYPE_REF_NUM") @ApiParam(value ="适配器使用数量") - private Integer taskRefNum; + private Integer typeRefNum; - @Column(name="TASK_DESCRIPTION") + @Column(name="TYPE_DESCRIPTION") @ApiParam(value ="类型描述") - private String taskDescription; + private String typeDescription; } From 752476b3dfb5188a262c1ec717bd7eab9e6844ab Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Oct 2019 20:11:39 +0800 Subject: [PATCH 55/82] =?UTF-8?q?[=E9=9C=80=E6=B1=821086=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E7=AC=AC2=E6=AC=A1=E6=8F=90=E4=BA=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 6 ++++++ .../java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 f25404e..5a14ad7 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 @@ -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.util.List; /** * @Description :设备作业任务明细 @@ -57,5 +59,9 @@ public class MesEquTaskDetail extends BaseBean { @ApiParam("维修标识") private Integer repairFlag; + @Transient + @ApiParam(value ="点检保养记录") + private List equTaskStandardRecordList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java index d93bbd5..e26b0c3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java @@ -31,7 +31,7 @@ import java.util.List; @Api("用户信息model") public class EquTaskNotifyUserModel extends BaseBean { - @ApiParam(value ="人员ID") + @ApiParam(value ="账户ID") private Long userId; @Column(name="USER_NAME_RDD") From 09cff08e1e1b04ad5f2f225ecffbe6c77dd5042f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Oct 2019 20:59:44 +0800 Subject: [PATCH 56/82] =?UTF-8?q?[=E9=9C=80=E6=B1=821086=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E7=AC=AC2=E6=AC=A1=E6=8F=90=E4=BA=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 893994e..15ae3e1 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 @@ -330,7 +330,7 @@ public class MesEnumUtil { public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN { EMAIL(10, "邮件"), - USERPHONE(10, "手机号"); + USERPHONE(20, "手机号"); private int value; private String description; From 0c016485518e4fb08bfee0c0e963afefef4b13b1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 24 Oct 2019 13:25:24 +0800 Subject: [PATCH 57/82] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1088?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesEquTaskDetail.java | 21 ++++++- .../pojo/mes/bean/MesEquTaskRepairRecord.java | 68 ++++++++++++++++++++++ .../MesEquTaskRepairRecordRepository.java | 16 +++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java 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 5a14ad7..dfd7e1b 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 @@ -60,8 +60,27 @@ public class MesEquTaskDetail extends BaseBean { private Integer repairFlag; @Transient - @ApiParam(value ="点检保养记录") + @ApiParam(value = "点检保养记录") private List equTaskStandardRecordList; + @Transient + @ApiParam(value = "工位") + private String workCellCode; + + @Transient + @ApiParam(value = "生产线") + private String workCenterCode; + + @Transient + @ApiParam(value = "故障现象") + private String fpCode; + + @Transient + @ApiParam(value = "故障原因") + private String fcCode; + + @Transient + @ApiParam(value = "处理方法") + private String fmCode; } 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 new file mode 100644 index 0000000..f5720a9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java @@ -0,0 +1,68 @@ +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; + +/** + * @Description :设备维修作业记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_TASK_REPAIR_RECORD") +@Api("设备维修作业记录") +public class MesEquTaskRepairRecord extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name = "TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "FP_CODE") + @ApiParam("故障现象") + private String fpCode; + + @Column(name = "FC_CODE") + @ApiParam("故障原因") + private String fcCode; + + @Column(name = "FM_CODE") + @ApiParam("处理方法") + private String fmCode; + + @Column(name = "FINAL_RESULT") + @ApiParam("整体结果") + private Integer finalResult; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java new file mode 100644 index 0000000..f4c1308 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskRepairRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskRepairRecordRepository extends BaseRepository { +} From 1f9fc9f2800381dcd9704444570e7d2832163b82 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 24 Oct 2019 17:24:29 +0800 Subject: [PATCH 58/82] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E7=94=9F=E4=BA=A7=E6=97=B6=E9=97=B4=E7=9A=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/bean/AssistResourceSetTime.java | 26 ++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/aps/bean/MaterialSetTime.java | 21 +++++++++++++ 3 files changed, 82 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 000001d..43a7d40 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -19,4 +22,27 @@ import javax.persistence.Table; @Table(name = "APS_ASSIST_RESOURCE_SET_TIME") @Api("副资源设置时间") public class AssistResourceSetTime extends BaseAPS { + @Column(name="RES_CODE") + @ApiParam(value ="资源编码") + private String resCode; + + @Column(name="TYPE") + @ApiParam(value ="副资源使用类型") + private USE_TYPE type; + + @Column(name="PREV_RESOURCE") + @ApiParam(value ="前资源编码") + private String prevResource; + + @Column(name="POST_RESOURCE") + @ApiParam(value ="后资源编码") + private String postResource; + + @Column(name="TIME") + @ApiParam(value ="设置时间") + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private int priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index 60a6f84..cef57c9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -1,9 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_CALC; +import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_TYPE; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -19,4 +23,35 @@ import javax.persistence.Table; @Table(name = "APS_DYNAMIC_SET_TIME") @Api("动态设置时间") public class DynamicSetTime extends BaseAPS { + @Column(name="RES_CODE") + @ApiParam(value ="资源代码") + private String resCode; + + @Column(name="TYPE") + @ApiParam(value ="应用工作计划类型") + private DYNAMIC_SET_TYPE type; + + @Column(name="CONSIDER_ASS_RES") + @ApiParam(value ="是否启用副资源动态设置时间") + private Boolean considerAssRes; + + @Column(name="CONSIDER_MATERIAL") + @ApiParam(value ="是否启用物料动态设置时间") + private Boolean considerMaterial; + + @Column(name="ASS_RES_CALC") + @ApiParam(value ="副资源动态设置计算方式") + private DYNAMIC_SET_CALC assResCalc; + + @Column(name="MATERIAL_CALC") + @ApiParam(value ="物料动态设置时间计算方式") + private DYNAMIC_SET_CALC materialCalc; + + @Column(name="STATIC_CALC") + @ApiParam(value ="与静态设置时间计算方式") + private DYNAMIC_SET_CALC staticCalc; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private int priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index 7ec01f9..d437b48 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -2,8 +2,10 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -19,4 +21,23 @@ import javax.persistence.Table; @Table(name = "APS_MATERIAL_SET_TIME") @Api("物料设置时间") public class MaterialSetTime extends BaseAPS { + @Column(name="RES_CODE") + @ApiParam(value ="资源编码") + private String resCode; + + @Column(name="PREV_MATERIAL") + @ApiParam(value ="前物料编码") + private String prevMaterial; + + @Column(name="POST_MATERIAL") + @ApiParam(value ="后物料编码") + private String postMaterial; + + @Column(name="TIME") + @ApiParam(value ="设置时间") + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private int priority; } From 0824a58ead0ad6f5a80513251b1cdbf7ba6908bf Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 24 Oct 2019 21:03:08 +0800 Subject: [PATCH 59/82] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=A4=84=E7=90=86job,=20=E5=B9=BF=E6=92=AD=E6=92=AD?= =?UTF-8?q?=E6=8A=A5=E5=86=85=E5=AE=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 1 + 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index ffdeef2..819f768 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : ANDON_自处理配置 @@ -67,4 +69,8 @@ public class AndonDisposalCfg extends BaseBean { @Column(name = "FLOW_MEMO") @ApiParam(value = "审批意见") private String flowMemo; + + @Transient + @ApiParam(value = "审批意见集合") + private Integer[] flowStatusArray; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 833ebed..15572d5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -388,6 +388,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result); + DdlPreparedPack.getInPackArray(andonDisposalCfg.getFlowStatusArray(), "flowStatus", result); DdlPreparedPack.getNumEqualPack(andonDisposalCfg.getFlowStatus(),"flowStatus", result); getStringBuilderPack(andonDisposalCfg, result); From a880160f3d57665249d517aeabb9eb912a1d45f0 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Fri, 25 Oct 2019 10:28:46 +0800 Subject: [PATCH 60/82] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E3=80=91bug=206104?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index ac86f7e..b55e892 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -30,12 +30,12 @@ public class WmsInterfaceDataMapper extends BaseBean { * 排序编号 */ @Column(name = "SEQ") - public int seq; + public Integer seq; /** * 来源表的每次查询记录数，防止大量数据造成内存溢出 */ @Column(name = "SRC_GET_LIMIT") - public int srcGetLimit; + public Integer srcGetLimit; /** * 接口数据源编号（在动态表单中配置） */ @@ -132,23 +132,23 @@ public class WmsInterfaceDataMapper extends BaseBean { * 调用脚本方法获取数据 */ @Column(name = "USE_SCRIPT_PULL") - public int useScriptPull; + public Integer useScriptPull; /** * 调用脚本方法保存数据 */ - @Column(name = "USE_SCRIPT_PUSH") - public int useScriptPush; + @Column(name = "USE_SCRIPT_PUSH") + public Integer useScriptPush; /** * 调用脚本方法更新同步标志 */ @Column(name = "USE_SCRIPT_MARK") - public int useScriptMark; + public Integer useScriptMark; /** * 调用脚本方法过滤数据（查询来源数据后过滤） */ @Column(name = "USE_SCRIPT_FILTER") - public int useScriptFilter; + public Integer useScriptFilter; } From caf6dc17ab366beba3d6282ef8fdabfb91320260 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 25 Oct 2019 10:52:15 +0800 Subject: [PATCH 61/82] =?UTF-8?q?=E3=80=90NC=E5=86=BB=E7=BB=93=E3=80=91nc?= =?UTF-8?q?=E5=86=BB=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 822a771..332fe96 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 @@ -797,6 +797,7 @@ public class WmsEnumUtil { VDAREPORT("VDAREPORT", "VDA生产报工"), VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"), VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"), + VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"), VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"); private String value; From a537daee62ffcdf16521a4a0190ad3d60315246d Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 25 Oct 2019 10:55:53 +0800 Subject: [PATCH 62/82] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=9C=89=E6=95=88=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 457b27d..5ed2462 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 @@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID") @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED") From e5b5891d2311bbf8b938fae62e47ad06f5b4ef25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Oct 2019 11:48:02 +0800 Subject: [PATCH 63/82] =?UTF-8?q?bom=E4=BF=A1=E6=81=AF=E4=B8=AD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=86=97=E4=BD=99=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 16 ++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index dfdad1f..01b1fea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -84,6 +85,18 @@ public class WmsBom extends BaseBean { @Column(name = "EFF_END_TIME") private String effEndTime; + @ApiParam(value = "目标存储区") + @Transient + public String destZoneNo; + + @ApiParam(value = "交易类型") + @Transient + public String transTypeCode; + + @ApiParam(value = "线路代码") + @Transient + public String routingCode; + public Double getQty() { return this.qty == null ? 0 : this.qty.doubleValue(); } 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 46d6355..d30e639 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 @@ -2460,4 +2460,20 @@ public class WmsHqlPack { return result; } + + /** + * 根据父物料查询子物料的bom信息 + * + * @param wmsBom + * @return + */ + public static DdlPackBean packHqlWmsBomByItemPartNo(WmsBom wmsBom) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsBom.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsBom, result); + + return result; + } } From 4c6f0b0d5716bb73c7d5711de3fc1beb88aa31d6 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 25 Oct 2019 13:00:37 +0800 Subject: [PATCH 64/82] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20CRUD=20Base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index 4a864be..7a42440 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -88,4 +88,8 @@ public class LacCommandStackRecord extends BaseBean { @ApiParam(value ="执行状态") private Integer stackStatus; + @Column(name="EXECUTION_DESCRIPTION") + @ApiParam(value ="执行说明") + private String executionDescription; + } From ca0cf21a7c5277fb720ac2ff57ab89a803842bb0 Mon Sep 17 00:00:00 2001 From: lpx Date: Fri, 25 Oct 2019 13:21:40 +0800 Subject: [PATCH 65/82] =?UTF-8?q?=E3=80=90NC=E8=A7=A3=E5=86=BB-4.2=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=8D=E7=94=A8=E3=80=91PR12-01~PR12-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 332fe96..9546754 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 @@ -798,7 +798,8 @@ public class WmsEnumUtil { VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"), VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"), VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"), - VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"); + VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"), + VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"); private String value; private String description; From 16162542ba495392a633775bd93764f39e59e8c5 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 25 Oct 2019 13:47:02 +0800 Subject: [PATCH 66/82] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9listByPage?= =?UTF-8?q?=E7=94=B1GET=E6=96=B9=E6=B3=95=E4=B8=BAPOST=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 8 +++---- .../cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java | 15 +++++++++++++ .../cn/estsh/i3plus/pojo/aps/model/APSPager.java | 26 +++++++++++++++++++++- 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 08be72e..95b5a20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -42,7 +42,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PREV_SET_TIME") @ApiParam(value ="前设置时间") - private Long prevSetTime; + private Integer prevSetTime; @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") @@ -54,7 +54,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - private Long produceTime; + private Integer produceTime; @Column(name="POST_SET_BEGIN") @ApiParam(value ="后设置开始时间") @@ -66,7 +66,7 @@ public class WorkPlan extends BaseAPS { @Column(name="POST_SET_TIME") @ApiParam(value ="后设置时间") - private Long postSetTime; + private Integer postSetTime; @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @@ -78,7 +78,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间") - private Long lockTime; + private Integer lockTime; @Column(name="WORK_ID") @ApiParam(value ="工作对象id") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java new file mode 100644 index 0000000..8218c5b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :工作计划包含的时间类型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public enum PLAN_TYPE { + PREV_SET, + PRODUCE, + POST_SET, + LOCK +} 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 2cc398b..97f2c22 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 @@ -3,8 +3,32 @@ package cn.estsh.i3plus.pojo.aps.model; import cn.estsh.i3plus.pojo.base.common.Pager; import lombok.Data; +import java.util.List; + @Data public class APSPager extends Pager { + public static class SortData { + // 排序对象 + private String name; + // 排序类型，1为升序，0为降序 + private int orderType; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getOrderType() { + return orderType; + } + + public void setOrderType(int orderType) { + this.orderType = orderType; + } + } private String filter; - private String sort; + private List sorts; } From 2906667856cc9805b34bfb6d951072b066287cea Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 25 Oct 2019 15:01:00 +0800 Subject: [PATCH 67/82] =?UTF-8?q?mes=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AE=89=E7=81=AF=E4=BB=BB=E5=8A=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/andon/AndonManageQueueSyncModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java new file mode 100644 index 0000000..cf2a454 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: mes定时获取安灯安灯任务信息请求DTO + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-25-14:40 + * @Modify: + **/ +@Data +public class AndonManageQueueSyncModel{ + + @ApiParam("同步时间") + private String syscTime; + + @ApiParam("安灯状态") + private List statusList; + + @ApiParam("组织代码") + private String organizeCode; +} From a90aa8498f435f3b83b96a53af376a7dc0d71504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Oct 2019 15:39:53 +0800 Subject: [PATCH 68/82] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E3=80=90int=E3=80=91?= =?UTF-8?q?=E6=94=B9=E6=88=90=E3=80=90Integer=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index ac86f7e..33e46a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -30,12 +30,12 @@ public class WmsInterfaceDataMapper extends BaseBean { * 排序编号 */ @Column(name = "SEQ") - public int seq; + public Integer seq; /** * 来源表的每次查询记录数，防止大量数据造成内存溢出 */ @Column(name = "SRC_GET_LIMIT") - public int srcGetLimit; + public Integer srcGetLimit; /** * 接口数据源编号（在动态表单中配置） */ @@ -132,23 +132,23 @@ public class WmsInterfaceDataMapper extends BaseBean { * 调用脚本方法获取数据 */ @Column(name = "USE_SCRIPT_PULL") - public int useScriptPull; + public Integer useScriptPull; /** * 调用脚本方法保存数据 */ @Column(name = "USE_SCRIPT_PUSH") - public int useScriptPush; + public Integer useScriptPush; /** * 调用脚本方法更新同步标志 */ @Column(name = "USE_SCRIPT_MARK") - public int useScriptMark; + public Integer useScriptMark; /** * 调用脚本方法过滤数据（查询来源数据后过滤） */ @Column(name = "USE_SCRIPT_FILTER") - public int useScriptFilter; + public Integer useScriptFilter; } From 3e9cc950178934473329c0caa3fd24d77cb45c47 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 25 Oct 2019 15:50:29 +0800 Subject: [PATCH 69/82] =?UTF-8?q?pojo-model=E5=8A=A0=E5=85=A5andon-pojo?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39a7704..7f12b9c 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -36,6 +36,11 @@ i3plus.pojo + i3plus-pojo-andon + + + + i3plus.pojo i3plus-pojo-wms From 00e849a62edbd9e6a7350a256874ca97e17d4613 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 25 Oct 2019 20:00:06 +0800 Subject: [PATCH 70/82] =?UTF-8?q?(1089=20=E8=BF=87=E7=A8=8B=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=9B1090=20=E8=BF=94=E5=8E=82=E8=BF=94=E4=BF=AE=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 189 +++++++++++++++++++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 162 ++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 10 ++ .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 7 +- .../pojo/mes/pcn/bean/MesDismantleRecord.java | 2 +- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 2 +- .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 16 +- .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 4 +- .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 2 +- .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 31 ++++ .../i3plus/pojo/mes/pcn/model/MesPartBomModel.java | 36 ---- .../pojo/mes/pcn/model/MesProcessBomModel.java | 61 +++++++ .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 59 +++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesRepair.java | 2 +- .../i3plus/pojo/mes/bean/MesRepairRecord.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 2 +- 19 files changed, 526 insertions(+), 67 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java 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 15ae3e1..1d8aa2a 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 @@ -12,6 +12,159 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes 图片面位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_SIDE_LOCATION { + + A_SIDE(10, "A面"), + B_SIDE(20, "B面"), + C_SIDE(30, "C面"), + D_SIDE(40, "D面"); + + private int value; + private String description; + + MES_SIDE_LOCATION(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes缺陷类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_TYPE { + + DEFECT_TYPE1(10, "缺陷类型1"), + DEFECT_TYPE2(20, "缺陷类型2"), + DEFECT_TYPE3(30, "缺陷类型3"); + + private int value; + private String description; + + MES_DEFECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes类型信息，业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_TYPE_CFG_BUSIN_TYPE { + + BUSIN_TYPE1(10, "业务类型1"), + BUSIN_TYPE2(20, "业务类型2"), + BUSIN_TYPE3(30, "业务类型3"); + + private int value; + private String description; + + MES_TYPE_CFG_BUSIN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes缺陷原因类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_CAUSE_TYPE { + + QUALITY_DEFECTS(10, "质量缺陷"), + PROCESS_DEFECTS(20, "工艺缺陷"), + EQUIPMENT_DEFECT(30, "设备缺陷"); + + private int value; + private String description; + + MES_DEFECT_CAUSE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes设备作业任务明细-执行状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -452,8 +605,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_WORK_CELL_TYPE { - NORMAL(1, "正常"), - REWORK(2, "返修"); + NORMAL(10, "正常"), + REWORK(20, "返修"); private int value; private String description; @@ -500,8 +653,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_TYPE { - BIND(1, "绑定"), - UNTYING(2, "解绑"); + BIND(10, "绑定"), + UNTYING(20, "解绑"); private int value; private String description; @@ -548,8 +701,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_IS_KEY { - IS_KEY(1, "是"), - NO_KEY(2, "否"); + IS_KEY(10, "是"), + NO_KEY(20, "否"); private int value; private String description; @@ -596,8 +749,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_REPAIR_STATUS { - REPAIRED(1, "已维修"), - NO_REPAIR(2, "待维修"); + REPAIRED(10, "已维修"), + NO_REPAIR(20, "待维修"); private int value; private String description; @@ -644,11 +797,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_OPERATE_TYPE { - WORKSTATION_SCAN(1, "工位扫描"), - QUALITY_JUDGEMENT(2, "质量判定"), - MATERIAL_DISMANTLING(3, "物料拆解"), - REWORK(4, "返修作业"), - WORKSTATION_MONITORING(5, "工位监控"); + WORKSTATION_SCAN(10, "工位扫描"), + QUALITY_JUDGEMENT(20, "质量判定"), + MATERIAL_DISMANTLING(30, "物料拆解"), + REWORK(40, "返修作业"), + WORKSTATION_MONITORING(50, "工位监控"); private int value; private String description; @@ -1323,9 +1476,7 @@ public class MesEnumUtil { public enum PASS_FAIL { PASS(1, "合格"), - FAIL(2, "不合格"), - SCRAP(3, "报废"), - DISMANTLED(4, "已拆解"); + FAIL(2, "不合格"); private int value; private String description; @@ -1796,7 +1947,8 @@ public class MesEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), - SCRAPED(30, "报废"); + SCRAPED(30, "报废"), + DISMANTLED(40, "已拆解"); private int value; private String description; @@ -2104,7 +2256,8 @@ public class MesEnumUtil { UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"), PCN_PULL(60, "PCN_PULL"), PCN_PUSH(70, "PCN_PUSH"), - FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"); + FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"), + REWORK_REPAIR(90, "REWORK_REPAIR"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 34ce4d8..c6a96dc 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 @@ -13,6 +13,168 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * mes缺陷原因类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_CAUSE_TYPE { + + QUALITY_DEFECTS(10, "质量缺陷"), + PROCESS_DEFECTS(20, "工艺缺陷"), + EQUIPMENT_DEFECT(30, "设备缺陷"); + + private int value; + private String description; + + MES_DEFECT_CAUSE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + + /** + * mes 图片面位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_SIDE_LOCATION { + + A_SIDE(10, "A面"), + B_SIDE(20, "B面"), + C_SIDE(30, "C面"), + D_SIDE(40, "D面"); + + private int value; + private String description; + + MES_SIDE_LOCATION(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes 维修状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_REPAIR_STATUS { + + REPAIRED(10, "已维修"), + NO_REPAIR(20, "待维修"); + + private int value; + private String description; + + MES_REPAIR_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; + } + + } + + /** + * mes过程质量检测类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_CHECK_TYPE { + + FIRST_CHECK(10, "首检"), + ON_SITE_CHECK(20, "巡检"), + END_CHECK(30, "尾检"); + + private int value; + private String description; + + MES_QC_CHECK_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; + } + } + + /** * mes-pcn定时任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 09d4d3d..fa5a461 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 @@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -39,4 +41,12 @@ public class MesDefect extends BaseBean { @Column(name = "DEFECT_TYPE") @ApiParam("缺陷类型") private String defectType; + + @Transient + @ApiParam("缺陷位置") + private String defectLocation; + + @Transient + @ApiParam("缺陷类型子集") + private List mesDefectList; } 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 72d0b14..53f4b36 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 @@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -49,7 +51,7 @@ public class MesDefectRecord extends BaseBean { @Column(name="DEFECT_LOCATION") @ApiParam("缺陷位置") - private Integer defectLocation; + private String defectLocation; @Column(name="REPAIR_STATUS") @ApiParam("维修状态") @@ -66,4 +68,7 @@ public class MesDefectRecord extends BaseBean { @Column(name="MEMO") @ApiParam("备注") private String memo; + + @Transient + private List mesDefectList; } 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 a114b7a..2775754 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 @@ -82,5 +82,5 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } 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 d708cb3..abb7861 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 @@ -87,7 +87,7 @@ public class MesProdBindRecord extends BaseBean { @Column(name = "IS_KEY") @ApiParam(value = "是否关键件") - private String isKey; + private Integer isKey; @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") 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 43d8681..26bccb6 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 @@ -80,7 +80,7 @@ public class MesQcCheckData extends BaseBean { @Column(name = "QTY") @ApiParam("产品数量") - private String qty; + private Integer qty; @Column(name = "MEMO") @ApiParam("备注") 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 77c5220..9753ac8 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 @@ -34,7 +34,7 @@ public class MesRepair extends BaseBean { @Column(name = "REPAIR_NAME") @ApiParam("维修名称") - private String repariName; + private String repairName; @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") 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 a3ce644..92c37be 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 @@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -82,5 +84,17 @@ public class MesRepairRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; + + @Transient + @ApiParam("备注") + private String spareMemo; + + @Transient + @ApiParam("不良记录id") + private Long defectRecordId; + + @Transient + @ApiParam("缺陷集合") + private List mesDefectList; } 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 e83ca89..2c60f7a 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 @@ -46,7 +46,7 @@ public class MesScrapRecord extends BaseBean { @Column(name = "SCRAP_CODE") @ApiParam("报废代码") - private String repairCode; + private String scrapCode; @Column(name = "SCRAP_NAME") @ApiParam("报废名称") @@ -66,5 +66,5 @@ public class MesScrapRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } 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 753c9cb..efcf8fd 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 @@ -45,5 +45,5 @@ public class MesWorkCell extends BaseBean { @Column(name = "WORK_CELL_TYPE") @ApiParam("工位类型") - private String workCellType; + private Integer workCellType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java new file mode 100644 index 0000000..b9acba1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesDefectModel { + + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @Transient + @ApiParam("缺陷分类子集") + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java deleted file mode 100644 index 0f0fccd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\18 19:15 - * @Modify: - **/ -@Data -@Api("mes 物料BOM") -public class MesPartBomModel { - - @ApiParam("物料编号") - private String partNo; - - @ApiParam("物料名称") - private String partName; - - @ApiParam("数量") - private Integer qty; - - public MesPartBomModel() { - - } - - public MesPartBomModel(String partNo, String partName, Integer qty) { - this.partNo = partNo; - this.partName = partName; - this.qty = qty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java new file mode 100644 index 0000000..11940aa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesProcessBomModel { + + private Long id; + @ApiParam("子物料编码") + private String itemPartNo; + @ApiParam("子物料名称") + private String itemPartName; + @ApiParam("产品数量") + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + + public MesProcessBomModel() { + + } + + public MesProcessBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java new file mode 100644 index 0000000..9dece32 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:05 + * @Modify: + **/ +@Data +public class MesProdBindRecordModel { + private Long id; + private String itemPartNo; + private String itemPartName; + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + private String kpSn; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + public MesProdBindRecordModel() { + + } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.dismantleQty = dismantleQty; + } +} 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 98709ec..08f1544 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 @@ -38,5 +38,5 @@ public class MesRepair extends BaseBean { @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") - private Integer repairType; + private String repairType; } 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 ba6331c..5e3e15f 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 @@ -82,5 +82,5 @@ public class MesRepairRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } 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 4dd7e2c..22086da 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 @@ -62,5 +62,5 @@ public class MesScrapRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } 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 68ef0b4..b0992b6 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 @@ -49,7 +49,7 @@ public class MesWorkCell extends BaseBean { @Column(name = "WORK_CELL_TYPE") @ApiParam("工位类型") - private String workCellType; + private Integer workCellType; @Transient @ApiParam(value = "子集列表") From d87d81e34ab8c8b30fb57942f02bb3966f3f8e78 Mon Sep 17 00:00:00 2001 From: jiajack Date: Sat, 26 Oct 2019 11:14:53 +0800 Subject: [PATCH 71/82] =?UTF-8?q?=E3=80=90=E4=BA=A7=E7=BA=BF=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=83=85=E5=86=B5=E3=80=91-BI=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ProductBiModel.java | 77 ++++++++++++++++++++++ .../pojo/mes/model/ProductBiSeriesModel.java | 24 +++++++ 2 files changed, 101 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java new file mode 100644 index 0000000..a7a613f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 用于产线运行情况数据 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +public class ProductBiModel { + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("生产区域代码") + private String areaCode; + + @ApiParam("运行状态") + private Integer runningStatus; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "计划数量") + private double planQty; + + @ApiParam(value = "产量") + private double outputQty; + + @ApiParam(value = "完成率") + private double CompleteRate; + + @ApiParam(value = "合格数量") + private double passQty; + + @ApiParam(value = "不良数量") + private double ngQty; + + @ApiParam(value = "合格率") + private double passRate; + + @ApiParam(value = "不良率") + private double ngRate; + + @ApiParam("客户代码") + private String customerCode; + + @ApiParam("客户名称") + private String customerName; + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("图表显示的数据") + private List series; + + public double getCompleteRate() { + if(this.planQty != 0) { + this.CompleteRate = outputQty / planQty; + } else { + this.CompleteRate = 0; + } + return this.CompleteRate; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java new file mode 100644 index 0000000..d7b15f8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 用于产线运行情况数据 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +public class ProductBiSeriesModel { + @ApiParam("名称") + private String name; + @ApiParam("类型") + private String type; + @ApiParam("显示的数据") + private List data; +} From aef7f7a9480c2e50d749162d9a0efb82c2dc7a5d Mon Sep 17 00:00:00 2001 From: jiajack Date: Sat, 26 Oct 2019 11:15:34 +0800 Subject: [PATCH 72/82] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 12 ++++++++++++ 2 files changed, 24 insertions(+) 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 37adc09..577fa77 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 @@ -47,4 +47,16 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private Double workTimes; + + @Column(name="SHIFT_SEQ") + @ApiParam("班次顺序") + private Integer shiftSeq; + + public int getShiftSeqVal() { + return this.shiftSeq == null ? 0 : this.shiftSeq; + } + + public double getWorkTimesVal() { + return this.workTimes == null ? 0.0d : this.workTimes; + } } 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 9c4f50a..0eb9772 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 @@ -47,4 +47,16 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private Double workTimes; + + @Column(name="SHIFT_SEQ") + @ApiParam("班次顺序") + private Integer shiftSeq; + + public int getShiftSeqVal() { + return this.shiftSeq == null ? 0 : this.shiftSeq; + } + + public double getWorkTimesVal() { + return this.workTimes == null ? 0.0d : this.workTimes; + } } From 9bdae2ad135507ef26bd453793e75844d0afd0b3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 26 Oct 2019 13:35:57 +0800 Subject: [PATCH 73/82] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1086?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 651fd4d..82bb4aa 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 @@ -58,6 +58,10 @@ public class MesEquTaskStandardRecord extends BaseBean { @ApiParam("操作指导") private String actionGuide; + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + @Column(name = "CHECK_RESULT") @ApiParam("判定结果") private Integer checkResult; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java index e26b0c3..49202fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java @@ -32,7 +32,7 @@ import java.util.List; public class EquTaskNotifyUserModel extends BaseBean { @ApiParam(value ="账户ID") - private Long userId; + private Long userInfoId; @Column(name="USER_NAME_RDD") @ApiParam(value ="用户名称" , access ="账号名称") From 8d10a46953ea9c06f6194531d276d1e462718a9b Mon Sep 17 00:00:00 2001 From: jokelone Date: Sat, 26 Oct 2019 16:57:45 +0800 Subject: [PATCH 74/82] =?UTF-8?q?(1092=20MesProdBindRecordModel=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9C=89=E5=8F=82=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java index 9dece32..aaa7497 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -56,4 +56,20 @@ public class MesProdBindRecordModel { this.parentPartName = parentPartName; this.dismantleQty = dismantleQty; } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } } From 56996126be34f7d5c3068161d157518ed754be4e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 26 Oct 2019 18:43:53 +0800 Subject: [PATCH 75/82] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1101?= =?UTF-8?q?=EF=BC=8Cmes=E5=90=8C=E6=AD=A5=E8=AE=BE=E5=A4=87=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E7=BB=B4=E4=BF=AE=E4=BB=BB=E5=8A=A1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++ .../i3plus/pojo/mes/model/AndonEquRepairModel.java | 86 ++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java 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 1d8aa2a..856f7c2 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 @@ -203,6 +203,43 @@ public class MesEnumUtil { } /** + * mes设备作业任务明细-判定结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_CHECK_RESULT { + + YES(10, "合格"), + NO(20, "不合格"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_CHECK_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes设备作业任务明细-整体结果 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java new file mode 100644 index 0000000..ed95336 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : mes同步设备安灯维修任务model + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes同步设备安灯维修任务model") +public class AndonEquRepairModel extends BaseBean { + + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @ApiParam(value = "工作中心代码") + public String workCenterCode; + + @ApiParam(value = "工作中心名称") + public String workCenterNameRdd; + + @ApiParam(value = "工作单元名称") + public String workCellNameRdd; + + @ApiParam(value = "工作单元代码") + public String workCellCode; + + @ApiParam(value = "设备代码") + public String equipmentCode; + + @ApiParam(value = "设备名称") + public String equipmentNameRdd; + + @ApiParam(value = "安灯状态代码") + public String statusCode; + + @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") + public String resetTime; + + @ApiParam(value = "呼叫原因代码") + public String acCode; + + @ApiParam(value = "呼叫原因描述") + public String acNameRdd; + + @ApiParam(value = "呼叫具体原因") + public String acDesc; + + @ApiParam(value = "事件原因代码") + public String ecCode; + + @ApiParam(value = "事件原因描述") + public String ecNameRdd; + + @ApiParam(value = "事件具体原因") + public String ecDesc; + + @ApiParam(value = "事件方法代码") + public String emCode; + + @ApiParam(value = "事件方法描述") + public String emNameRdd; + + @ApiParam(value = "事件具体方法") + public String emDesc; + + @ApiParam(value = "事件现象代码") + private String epmCode; + + @ApiParam(value = "事件现象描述") + private String epmNameRdd; + + @ApiParam(value = "组织名称") + private String organizeNameRdd; + +} From 7d8b8664cc7350b23fe9f5e2859970601801a54a Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 26 Oct 2019 19:42:44 +0800 Subject: [PATCH 76/82] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonAlarmCause.java | 5 ++- .../pojo/andon/bean/AndonAlarmDetailType.java | 6 ++-- .../pojo/andon/bean/AndonCellAlarmCause.java | 8 ++--- .../pojo/andon/bean/AndonCellEventCause.java | 7 ++-- .../pojo/andon/bean/AndonCellEventMethod.java | 8 ++--- .../i3plus/pojo/andon/bean/AndonEventCause.java | 5 ++- .../i3plus/pojo/andon/bean/AndonEventMethod.java | 5 ++- .../pojo/andon/bean/AndonEventPhenoMenon.java | 2 ++ .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 6 ++-- .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 38 ++++++++-------------- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 11 files changed, 46 insertions(+), 46 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java index 0f46e3b..749eae4 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java @@ -28,7 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("ANDON_呼叫原因") +@Api(value = "ANDON_呼叫原因") public class AndonAlarmCause extends BaseBean { @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @@ -40,6 +40,7 @@ public class AndonAlarmCause extends BaseBean { @ApiParam(value = "呼叫原因代码") private String acCode; + @AnnoOutputColumn(hidden = true) @Column(name = "PARENT_AC_CODE") @ApiParam(value = "父阶原因代码") private String parentAcCode; @@ -48,10 +49,12 @@ public class AndonAlarmCause extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作中心") private String workCenterCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作单元") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java index b92a876..1ec4182 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java @@ -31,15 +31,15 @@ import javax.persistence.Table; public class AndonAlarmDetailType extends BaseBean { @Column(name = "ALARM_DETAIL_CODE") - @ApiParam(value = "安灯类型代码") + @ApiParam(value = "安灯子类型编码") private String alarmDetailCode; @Column(name = "ALARM_DETAIL_NAME") - @ApiParam(value = "安灯类型名称") + @ApiParam(value = "安灯子类型名称") private String alarmDetailName; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型代码") + @ApiParam(value = "安灯类型") private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index 87b497a..d79eb4b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java @@ -29,22 +29,20 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元呼叫原因配置") public class AndonCellAlarmCause extends BaseBean { - @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") + @ApiParam(value = "事件描述") private String acCode; - - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index afef3d0..4f04613 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,15 +35,16 @@ public class AndonCellEventCause extends BaseBean { private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @Column(name = "EC_CODE") - @ApiParam(value = "事件原因代码") + @ApiParam(value = "事件原因") private String ecCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index 2553c7c..b2f933c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java @@ -29,22 +29,20 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元处理方法配置") public class AndonCellEventMethod extends BaseBean { - @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @Column(name = "EM_CODE") - @ApiParam(value = "事件方法代码") + @ApiParam(value = "处理方法") private String emCode; - - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java index f5f0469..2491043 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java @@ -28,7 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("ANDON_事件原因") +@Api(value = "ANDON_事件原因") public class AndonEventCause extends BaseBean { @Column(name = "EC_CODE") @@ -41,6 +41,7 @@ public class AndonEventCause extends BaseBean { @Column(name = "PARENT_EC_CODE") @ApiParam(value = "父阶原因代码") + @AnnoOutputColumn(hidden = true) private String parentEcCode; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @@ -50,9 +51,11 @@ public class AndonEventCause extends BaseBean { @Transient @ApiParam(value = "工作中心") + @AnnoOutputColumn(hidden = true) private String workCenterCode; @Transient @ApiParam(value = "工作单元") + @AnnoOutputColumn(hidden = true) private String workCellCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java index ccd2315..f681bb6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java @@ -28,7 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("ANDON_事件处理方法") +@Api(value = "ANDON_事件处理方法") public class AndonEventMethod extends BaseBean { @Column(name = "EM_CODE") @@ -39,6 +39,7 @@ public class AndonEventMethod extends BaseBean { @ApiParam(value = "事件方法描述") private String emName; + @AnnoOutputColumn(hidden = true) @Column(name = "PARENT_EM_CODE") @ApiParam(value = "父阶方法代码") private String parentEmCode; @@ -48,10 +49,12 @@ public class AndonEventMethod extends BaseBean { @ApiParam(value = "安灯类型") private String alarmCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作中心") private String workCenterCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作单元") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java index 0580ab0..43877a3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java @@ -44,10 +44,12 @@ public class AndonEventPhenoMenon extends BaseBean { @ApiParam(value = "安灯类型") private String alarmCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作中心") private String workCenterCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作单元") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index 748105e..c18cf07 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -36,7 +36,7 @@ public class AndonPLC extends BaseBean { private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; @Column(name = "NODE_CODE") @@ -52,7 +52,7 @@ public class AndonPLC extends BaseBean { private String channelName; @Column(name = "TAG_NAME") - @ApiParam(value = "标签名称") + @ApiParam(value = "标签名字") private String tagName; @Column(name = "TAG_ADDRESS") @@ -79,7 +79,7 @@ public class AndonPLC extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") @Column(name = "IS_ALARM_STATUS") - @ApiParam(value = "是否按灯状态", example = "1") + @ApiParam(value = "是否按灯", example = "1") private Integer isAlarmStatus; public int getIsAlarmStatusVal(){ diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 15572d5..dd08d20 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -279,13 +279,10 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){ DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result); DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result); - getStringBuilderPack(andonAlarmCause, result); - return result; } @@ -296,10 +293,8 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){ DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result); getStringBuilderPack(andonEventMethod, result); - return result; } @@ -310,10 +305,8 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){ DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); getStringBuilderPack(andonEventCause, result); - return result; } @@ -365,7 +358,6 @@ public class AndonHqlPack { if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){ DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); } - getStringBuilderPack(andonManageQueue, result); // 根据优先级倒序，序号升序排序 // DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, @@ -627,9 +619,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result); DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result); DdlPreparedPack.getStringLikerPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result); - getStringBuilderPack(andonResponseObject, result); - return result; } @@ -640,13 +630,10 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result); DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result); - getStringBuilderPack(andonEventCause, result); - return result; } @@ -673,6 +660,11 @@ public class AndonHqlPack { DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmCode(), "epmCode", result); DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmName(), "epmName", result); DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, + new String[]{eventPhenoMenon.getOrderByParam()}, + result + ); getStringBuilderPack(eventPhenoMenon, result); @@ -681,18 +673,15 @@ public class AndonHqlPack { /** * ANDON_ 事件处理方法 - * @param eventPhenoMenon + * @param eventMethod * @return */ - public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) { + public static DdlPackBean packAndonEventMethod(AndonEventMethod eventMethod) { DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result); - DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmName(), "emName", result); - DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmCode(), "emCode", result); - - getStringBuilderPack(eventPhenoMenon, result); - + DdlPreparedPack.getStringEqualPack(eventMethod.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(eventMethod.getEmName(), "emName", result); + DdlPreparedPack.getStringLikerPack(eventMethod.getEmCode(), "emCode", result); + getStringBuilderPack(eventMethod, result); return result; } @@ -703,13 +692,14 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonPLC(AndonPLC plc) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result); DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result); DdlPreparedPack.getStringEqualPack(plc.getChannelName(),"channelName",result); DdlPreparedPack.getStringEqualPack(plc.getGroupNo(),"groupNo",result); - + DdlPreparedPack.getStringEqualPack(plc.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(plc.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result); getStringBuilderPack(plc, result); return result; } 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 5ed2462..3950979 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 @@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID") @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED") From 6902c794721baa273159f10fd13816e2ce08b67c Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 27 Oct 2019 11:51:18 +0800 Subject: [PATCH 77/82] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java | 11 ++++++----- .../cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java | 11 ++++++----- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 8 ++++---- .../cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 3 +-- .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 10 ++++++++++ 6 files changed, 30 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java index a6824e0..e0bbc8e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java @@ -32,16 +32,16 @@ public class AndonAlarmResponseCfg extends BaseBean { @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型代码") + @ApiParam(value = "安灯类型") private String alarmCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description") @Column(name = "ANDON_STATUS") @ApiParam(value = "安灯状态") private String andonStatus; @Column(name = "RP_WHERE") - @ApiParam(value = "通知条件时长") + @ApiParam(value = "通知时间") private String rpWhere; @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") @@ -50,7 +50,7 @@ public class AndonAlarmResponseCfg extends BaseBean { private String rpCode; @Column(name = "RP_OBJECT_CODE") - @ApiParam(value = "通知对象代码") + @ApiParam(value = "通知对象") private String rpObjectCode; @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description") @@ -59,9 +59,10 @@ public class AndonAlarmResponseCfg extends BaseBean { private String rpLevel; @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") + @ApiParam(value = "工作中心") private String workCenterCode; + @AnnoOutputColumn(hidden = true) @Column(name = "WORK_CENTER_NAME_RDD") @ApiParam(value = "工作中心名称") private String workCenterNameRdd; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 819f768..9f8d287 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -37,24 +37,24 @@ public class AndonDisposalCfg extends BaseBean { private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型代码") + @ApiParam(value = "安灯类型") private String alarmCode; @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") + @ApiParam(value = "事件描述编码") private String acCode; @Column(name = "AC_NAME_RDD") - @ApiParam(value = "呼叫原因描述") + @ApiParam(value = "事件描述名称") private String acNameRdd; @Column(name = "EM_CODE") - @ApiParam(value = "事件方法代码") + @ApiParam(value = "处理方法") private String emCode; @Column(name = "EM_NAME_RDD") @@ -72,5 +72,6 @@ public class AndonDisposalCfg extends BaseBean { @Transient @ApiParam(value = "审批意见集合") + @AnnoOutputColumn(hidden = true) private Integer[] flowStatusArray; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index c18cf07..2a8d9ad 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -32,7 +32,7 @@ import javax.persistence.Table; public class AndonPLC extends BaseBean { @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") + @ApiParam(value = "工作中心") private String workCenterCode; @Column(name = "WORK_CELL_CODE") @@ -40,7 +40,7 @@ public class AndonPLC extends BaseBean { private String workCellCode; @Column(name = "NODE_CODE") - @ApiParam(value = "控制节点代码") + @ApiParam(value = "控制节点编码") private String nodeCode; @Column(name = "NODE_IP") @@ -67,7 +67,7 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "分组号") private String groupNo; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @@ -79,7 +79,7 @@ public class AndonPLC extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") @Column(name = "IS_ALARM_STATUS") - @ApiParam(value = "是否按灯", example = "1") + @ApiParam(value = "是否安灯") private Integer isAlarmStatus; public int getIsAlarmStatusVal(){ diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java index fda0737..9cdb336 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java @@ -29,14 +29,14 @@ import javax.persistence.Table; public class AndonResponseObject extends BaseBean { @Column(name = "RP_OBJECT_CODE") - @ApiParam(value = "对象代码") + @ApiParam(value = "通知对象对象编码") private String rpObjectCode; @Column(name = "RP_OBJECT_NAME") - @ApiParam(value = "对象名称") + @ApiParam(value = "通知对象名称") private String rpObjectName; @Column(name = "RP_OBJECT_VALUE") - @ApiParam(value = "对象值") + @ApiParam(value = "通知对象值") private String rpObjectValue; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index dd08d20..5d13427 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -533,14 +533,13 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonAlarmResponseCfg(AndonAlarmResponseCfg responseCfg) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result); DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result); DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getOrganizeCode(), "organizeCode", result); - + DdlPreparedPack.getStringEqualPack(responseCfg.getRpCode(), "rpCode", result); getStringBuilderPack(responseCfg, result); return result; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 230f235..bbd3eb5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -453,6 +453,16 @@ public class AndonEnumUtil { } return tmp; } + + public static String descriptionOfCode(String val) { + String tmp = ""; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].code; + } + } + return tmp; + } } From 4eaa8b5b177a35769f6cea9d7103afbcd1acefad Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 27 Oct 2019 12:26:52 +0800 Subject: [PATCH 78/82] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java index 962309b..3c89d14 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java @@ -29,7 +29,7 @@ import javax.persistence.Table; public class AndonHaltType extends BaseBean { @Column(name = "HALT_CODE") - @ApiParam(value = "停机类型代码") + @ApiParam(value = "停机类型编码") private String haltCode; @Column(name = "HALT_NAME") 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 3950979..08085ad 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 @@ -74,7 +74,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "是否已删除",example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 - public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSE + public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") From 1e0f0c706cb37934bd447f3390907965e164dacc Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 27 Oct 2019 17:40:21 +0800 Subject: [PATCH 79/82] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonKnowledgeBase.java | 1 - .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 4 +- .../pojo/andon/bean/AndonResponseObject.java | 7 +++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 17 +++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 52 ++++++++++++++++++++++ 5 files changed, 78 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java index 835046b..ff4853d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java @@ -34,5 +34,4 @@ public class AndonKnowledgeBase extends BaseManageQueue { @Column(name = "FLOW_MEMO") @ApiParam(value = "审批意见") private String flowMemo; - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index 2a8d9ad..828a12a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -67,7 +67,7 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "分组号") private String groupNo; -// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @@ -77,7 +77,7 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "标签业务类型") private String tagBusinessType; - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = AndonEnumUtil.IS_ALARM_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "IS_ALARM_STATUS") @ApiParam(value = "是否安灯") private Integer isAlarmStatus; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java index 9cdb336..b2ad1a2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.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; @@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 安灯通知对象 @@ -39,4 +41,9 @@ public class AndonResponseObject extends BaseBean { @Column(name = "RP_OBJECT_VALUE") @ApiParam(value = "通知对象值") private String rpObjectValue; + + @AnnoOutputColumn(hidden = true) + @Transient + @ApiParam(value = "通知对象") + private String rpObjectValueRdd; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 5d13427..547a389 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -341,6 +341,23 @@ public class AndonHqlPack { * @param andonManageQueue * @return */ + public static DdlPackBean packHqlAndonManageQueueUseByPlc(AndonManageQueue andonManageQueue, Object[] obj){ + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); + DdlPreparedPack.getInPackArray(obj, "statusCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonManageQueue, result); + return result; + } + + /** + * 按条件查询按灯队列信息 + * @param andonManageQueue + * @return + */ public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){ DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index bbd3eb5..b27a4a3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -292,6 +292,58 @@ public class AndonEnumUtil { } /** + * 处理标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_ALARM_STATUS { + TRUE(10, "是"), FALSE(20, "否"); + + private int value; + private String description; + + private IS_ALARM_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) {return valueOf(val);} + public static int descriptionOfValue(String desc) {return descOf(desc);} + } + + + /** * 按灯状态 * 10-是，20-否 */ From 5183163abdf6d3260303444e9a5361126810c1dd Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 28 Oct 2019 14:24:30 +0800 Subject: [PATCH 80/82] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E9=80=89=E6=8B=A9=E5=AF=B9=E8=B1=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 3 +++ 4 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 6a0a0d2..eddecd7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -21,4 +21,5 @@ public @interface FieldAnnotation { int pric() default 2; // 对于浮点型，界面显示的精度 boolean mainkey() default false; // 是否为主键 String defaultValue() default ""; // 字段的默认值 + boolean popSearch() default false; // 弹出选择对象时是否显示 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index f302131..aedbbcd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -44,6 +44,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="类型名称") private String typeName; + @Column(name="TYPE_FULL_NAME") + @ApiParam(value ="类型全名称包含路径") + private String typeFullName; + @Column(name="CUSTOMIZE") @ApiParam(value ="是否为自定义字段") private Boolean customize; @@ -84,6 +88,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="字段默认值") private String defaultValue; + @Column(name="POP_SEARCH") + @ApiParam(value ="弹出选择时是否显示") + private Boolean popSearch; + @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 70f77de..261164e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -29,4 +30,9 @@ public class SysParam extends BaseAPS { @Column(name="MAX_INTERRUPT_COUNT") @ApiParam(value ="最大中断次数") private Integer maxInterruptCount; + + @Column(name="RULE_GROUP_ID") + @ApiParam(value ="规则组id") + @FieldAnnotation(display = false) + private Long ruleGroupId; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index b434092..0cb563a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,10 +19,12 @@ import javax.persistence.MappedSuperclass; public abstract class BaseCode extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true) private String code; @Column(name="NAME") @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) private String name; @Column(name="REMARK") From 7496eb4a1b16f55950c76cd669681e285af2b1b8 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 28 Oct 2019 16:09:57 +0800 Subject: [PATCH 81/82] =?UTF-8?q?LAC=20=E5=85=A8=E9=83=A8=20CRUD=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/lac/bean/LacCommandStackStep.java | 78 ++++++++++++++ .../pojo/lac/bean/LacCommandStackStepTask.java | 102 ++++++++++++++++++ .../pojo/lac/bean/LacCommandStackTemplate.java | 80 ++++++++++++++ .../cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java | 91 ++++++++++++++++ .../cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 116 +++++++++++++++++++++ .../i3plus/pojo/lac/bean/LacSuitTaskParam.java | 90 ++++++++++++++++ .../pojo/lac/bean/LacSuitTaskParamAdapter.java | 100 ++++++++++++++++++ .../repository/LacCommandStackStepRepository.java | 14 +++ .../LacCommandStackStepTaskRepository.java | 14 +++ .../LacCommandStackTemplateRepository.java | 14 +++ .../pojo/lac/repository/LacSuitCaseRepository.java | 15 +++ .../LacSuitTaskParamAdapterRepository.java | 14 +++ .../lac/repository/LacSuitTaskParamRepository.java | 14 +++ .../pojo/lac/repository/LacSuitTaskRepository.java | 14 +++ 14 files changed, 756 insertions(+) create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java new file mode 100644 index 0000000..84fb49f --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.lac.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 : + * + *
create table LacInstructionSetStep( + *
templateId bigint null, + *
templateNameRdd varchar(50) null, + *
templateCode varchar(50) null, + *
stepName varchar(50) null, + *
stepSort int null, + *
stepExecCond double null, + *
stepDescription varchar(255) null + *
); + * + *
comment on table LacInstructionSetStep is'指令集模板步骤'; + *
comment on column LacInstructionSetStep.templateId is'模板id'; + *
comment on column LacInstructionSetStep.templateNameRdd is'模板名称'; + *
comment on column LacInstructionSetStep.templateCode is'模板代码'; + *
comment on column LacInstructionSetStep.stepName is'步骤名称'; + *
comment on column LacInstructionSetStep.stepSort is'步骤顺序'; + *
comment on column LacInstructionSetStep.stepExecCond is'步骤执行条件'; + *
comment on column LacInstructionSetStep.stepDescription is'步骤描述'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午5:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_STEP") +@Api(value="指令集模板",description = "指令集模板信息") +public class LacCommandStackStep extends BaseBean { + + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="STEP_NAME") + @ApiParam(value ="模板名称") + private String stepName; + + @Column(name="STEP_CODE") + @ApiParam(value ="模板代码") + private String stepCode; + + @Column(name="STEP_SORT") + @ApiParam(value ="步骤顺序") + private Integer stepSort; + + @Column(name="STEP_EXEC_COND") + @ApiParam(value ="步骤执行条件") + private Integer stepExecCond; + + @Column(name="STEP_DESCRIPTION") + @ApiParam(value ="步骤执行条件") + private String stepDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java new file mode 100644 index 0000000..a0aac59 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.pojo.lac.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 : + * + *
create table LacInstructionSetStepTask( + *
templateId bigint null, + *
templateNameRdd varchar(50) null, + *
templateCode varchar(50) null, + *
stepId bigint null, + *
stepNameRdd varchar(50) null, + *
taskId bigint null, + *
taskNameRdd varchar(50) null, + *
taskCode varchar(50) null, + *
isCrux int null + *
); + * + *
comment on table LacInstructionSetStepTask is'指令集模板步骤任务'; + *
comment on column LacInstructionSetStepTask.templateId is'模板id'; + *
comment on column LacInstructionSetStepTask.templateNameRdd is'模板名称'; + *
comment on column LacInstructionSetStepTask.templateCode is'模板代码'; + *
comment on column LacInstructionSetStepTask.stepId is'步骤id'; + *
comment on column LacInstructionSetStepTask.stepNameRdd is'步骤名称'; + *
comment on column LacInstructionSetStepTask.taskId is'任务id'; + *
comment on column LacInstructionSetStepTask.taskNameRdd is'任务名称'; + *
comment on column LacInstructionSetStepTask.taskCode is'任务代码'; + *
comment on column LacInstructionSetStepTask.isCrux is'是否关键'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_STEP_TASK") +@Api(value="步骤任务",description = "步骤任务信息") +public class LacCommandStackStepTask extends BaseBean { + + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + +// @Column(name="TEMPLATE_NAME_RDD") +// @ApiParam(value ="模板名称") +// private String templateNameRdd; +// +// @Column(name="TEMPLATE_CODE_RDD") +// @ApiParam(value ="模板代码") +// private String templateCodeRdd; + + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; +// +// @Column(name="STEP_NAME_RDD") +// @ApiParam(value ="步骤名称") +// private String stepNameRdd; +// +// @Column(name="STEP_CODE_RDD") +// @ApiParam(value ="步骤代码") +// private String stepCodeRdd; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="STEP_NAME_RDD") + @ApiParam(value ="步骤名称") + private String taskNameRdd; + + @Column(name="STEP_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + + @Column(name="IS_CRUX") + @ApiParam(value ="是否关键") + private Integer isCrux; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java new file mode 100644 index 0000000..11ff867 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.lac.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 : + * + *
create table instructionSetTemplate( + *
templateName varchar(50) null, + *
templateCode varchar(50) null, + *
templateTypeId bigint null, + *
templateTypeNameRdd varchar(50) null, + *
templateDescription varchar(50) null, + *
templateStepNum int null + *
); + * + *
comment on table instructionSetTemplate is'指令集模板'; + *
comment on column instructionSetTemplate.templateName is'模板名称'; + *
comment on column instructionSetTemplate.templateCode is'模板代码'; + *
comment on column instructionSetTemplate.templateTypeId is'模板大类id'; + *
comment on column instructionSetTemplate.templateTypeNameRdd is'模板大类名称'; + *
comment on column instructionSetTemplate.templateDescription is'模板描述'; + *
comment on column instructionSetTemplate.templateStepNum is'模板步骤'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午5:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_TEMPLATE") +@Api(value="指令集模板",description = "指令集模板信息") +public class LacCommandStackTemplate extends BaseBean { + + @Column(name="TEMPLATE_NAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long stackTypeId; + + @Column(name="STACK_TYPE_NAME_RDD") + @ApiParam(value ="类型名称") + private String stackTypeNameRdd; + + @Column(name="TYPE_DESCRIPTION") + @ApiParam(value ="模板大类名称") + private String typeDescription; + + @Column(name="TEMPLATE_NUM") + @ApiParam(value ="适配器使用数量") + private Integer templateNum; + + @Column(name="TEMPLATE_DESCRIPTION") + @ApiParam(value ="模板描述") + private String templateDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java new file mode 100644 index 0000000..af6e6fb --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.lac.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 : + * + *
create table LacSuitCase( + *
sutiCaseId bigint null, + *
sutiCaseNameRdd varchar(50) null, + *
suitCaseCode varchar(50) null, + *
sutiType int null, + *
hardwareType int null, + *
returnMethod int null, + *
timeout int null, + *
retryNum int null, + *
successNum int null, + *
failNum int null, + *
countNum int null, + *
sutiCaseStatus int null + *
); + *
+ *
comment on table LacSuitCase is'适配器'; + *
comment on column LacSuitCase.sutiCaseId is'适配器id'; 不推荐使用ID绑定，数据库调整会有变动，推荐使用Code 绑定 + *
comment on column LacSuitCase.sutiCaseNameRdd is'适配器名称'; + *
comment on column LacSuitCase.suitCaseCode is'适配器代码'; + *
comment on column LacSuitCase.sutiType is'适配器类型（枚举）'; + *
comment on column LacSuitCase.hardwareType is'硬件类型（枚举）'; + *
comment on column LacSuitCase.returnMethod is'返回方式（枚举）'; + *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中 + *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.successNum is'成功次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.failNum is'失败次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.countNum is'总次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.sutiCaseStatus is'适配器状态'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:08 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_CASE") +@Api(value="适配器",description = "适配器信息") +public class LacSuitCase extends BaseBean { + + @Column(name="SUTI_CASE_NAME_RDD") + @ApiParam(value ="适配器名称") + private String sutiCaseNameRdd; + + @Column(name="SUIT_CASE_CODE_RDD") + @ApiParam(value ="适配器代码") + private String suitCaseCodeRdd; + + @Column(name="SUTI_TYPE") + @ApiParam(value ="适配器类型") + private Integer sutiType; + + @Column(name="HARDWARE_TYPE") + @ApiParam(value ="硬件类型") + private Integer hardwareType; + + @Column(name="RETURN_METHOD") + @ApiParam(value ="返回类型") + private Integer returnMethod; + + @Column(name="SUTI_CASE_STATUS") + @ApiParam(value ="适配器状态") + private Integer sutiCaseStatus; + + @Column(name="SUIT_CASE_DESCRIPTION") + @ApiParam(value ="适配器描述") + private String suitCaseDescription; + +} 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 new file mode 100644 index 0000000..d9af1a4 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -0,0 +1,116 @@ +package cn.estsh.i3plus.pojo.lac.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 : + * + *
create table LacSuitTask( + *
taskName varchar(50) null, + *
taskCode varchar(50) null, + *
taskTypeId bigint null, + *
taskTypeNameRdd varchar(50) null, + *
suitCaseId bigint null, + *
suitCaseCode varchar(50) null, + *
suitCaseNameRdd varchar(50) null, + *
successNum int null, + *
failNum int null, + *
countNum int null, + *
taskDescription varchar(255) null + *
); + *
comment on table LacSuitTask is'适配任务'; + *
comment on column LacSuitTask.taskName is'任务名称'; + *
comment on column LacSuitTask.taskCode is'任务代码'; + *
comment on column LacSuitTask.taskTypeId is'任务大类id'; + *
comment on column LacSuitTask.taskTypeNameRdd is'任务大类名称'; + *
comment on column LacSuitTask.suitCaseId is'适配器id'; + *
comment on column LacSuitTask.suitCaseCode is'适配器代码'; + *
comment on column LacSuitTask.suitCaseNameRdd is'适配器名称'; + *
comment on column LacSuitTask.successNum is'成功次数'; + *
comment on column LacSuitTask.failNum is'适配次数'; + *
comment on column LacSuitTask.countNum is'总次数'; + *
comment on column LacSuitTask.taskDescription is'任务描述'; + *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中 + *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中 + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK") +@Api(value="调度任务",description = "调度任务信息") +public class LacSuitTask extends BaseBean { + + @Column(name="TASK_NAME") + @ApiParam(value ="适配器名称") + private String taskName; + + @Column(name="TASK_CODE") + @ApiParam(value ="适配器代码") + private String taskCode; + + @Column(name="TASK_TIMEOUT") + @ApiParam(value ="超时时间") + private Integer taskTimeout; + + @Column(name="TASK_RETRY_NUM") + @ApiParam(value ="重试次数") + private Integer taskRetryNum; + + @Column(name="TASK_TYPE_ID") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskTypeId; + + @Column(name="TASK_TYPE_NAME_RDD") + @ApiParam(value ="任务类型名称") + private String taskTypeNameRdd; + + @Column(name="SUIT_CASE_ID") + @ApiParam(value ="适配器ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name="SUTI_CASE_NAME_RDD") + @ApiParam(value ="适配器名称") + private String suitCaseNameRdd; + + @Column(name="SUIT_CASE_CODE_RDD") + @ApiParam(value ="适配器代码") + private String suitCaseCodeRdd; + + @Column(name="NUM_SUCCESS") + @ApiParam(value ="执行成功次数") + private Integer numSuccess = 0; + + @Column(name="NUM_FAIL") + @ApiParam(value ="执行失败次数") + private Integer numFail = 0; + + @Column(name="NUM_COUNT") + @ApiParam(value ="执行次数") + private Integer numCount = 0; + + @Column(name="TASK_DESCRIPTION") + @ApiParam(value ="任务描述") + private String taskDescription; + +} 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 new file mode 100644 index 0000000..2b4b3af --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.lac.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 : + * + *
create table LacSuitTaskParam( + *
suitTaskId bigint null, + *
suitTaskName varchar(50) null, + *
suitTaskCode varchar(50) null, + *
paramName varchar(50) null, + *
paramType int null, + *
paramValueType int null, + *
defaultValue varchar(50) null, + *
paramDescrition varchar(255) null + *
); + *
comment on table LacSuitTaskParam is'适配任务参数'; + *
comment on column LacSuitTaskParam.suitTaskId is'适配任务id'; + *
comment on column LacSuitTaskParam.suitTaskName is'适配任务名称'; + *
comment on column LacSuitTaskParam.suitTaskCode is'适配任务代码'; + *
comment on column LacSuitTaskParam.paramName is'参数名称'; + *
comment on column LacSuitTaskParam.paramType is'参数类型(枚举)'; + *
comment on column LacSuitTaskParam.paramValueType is'参数值类型(枚举)'; + *
comment on column LacSuitTaskParam.defaultValue is'默认值'; + *
comment on column LacSuitTaskParam.paramDescrition is'参数描述'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:49 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK_PARAM") +@Api(value="调度任务参数",description = "调度任务参数信息") +public class LacSuitTaskParam extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + @Column(name="PARAM_NAME") + @ApiParam(value ="参数名称") + private String paramName; + + @Column(name="PARAM_CODE") + @ApiParam(value ="参数编码") + private String paramCode; + + @Column(name="PARAM_TYPE") + @ApiParam(value ="参数类型") + private Integer paramType; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private Integer paramValueType; + + @Column(name="PARAM_DEFAULT_VALUE") + @ApiParam(value ="参数默认值") + private String paramDefaultValue; + + @Column(name="PARAM_DESCRIPTION") + @ApiParam(value ="参数描述") + private String paramDescription; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java new file mode 100644 index 0000000..b44528b --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.lac.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 : + * + *
create table LacSuitTaskParamAdapter( + *
sutiTaskId bigint null, + *
suitTaskCode varchar(50) null, + *
suitTaskNameRdd varchar(50) null, + *
paramId bigint null, + *
paramName varchar(50) null, + *
paramType int null, + *
paramValueType int null, + *
defaultValue varchar(50) null, + *
transferParamName varchar(50) null, + *
transferParamValueType int null + *
); + *
comment on table LacSuitTaskParamAdapter is'适配任务参数转换'; + *
comment on column LacSuitTaskParamAdapter.sutiTaskId is'适配任务id'; + *
comment on column LacSuitTaskParamAdapter.suitTaskCode is'适配任务代码'; + *
comment on column LacSuitTaskParamAdapter.suitTaskNameRdd is'适配任务名称'; + *
comment on column LacSuitTaskParamAdapter.paramId is'参数id'; + *
comment on column LacSuitTaskParamAdapter.paramName is'参数名称'; + *
comment on column LacSuitTaskParamAdapter.paramType is'参数类型(枚举)'; + *
comment on column LacSuitTaskParamAdapter.paramValueType is'参数值类型(枚举)'; + *
comment on column LacSuitTaskParamAdapter.defaultValue is'默认值'; + *
comment on column LacSuitTaskParamAdapter.transferParamName is'转换后参数名称'; + *
comment on column LacSuitTaskParamAdapter.transferParamValueType is'转换后参数值类型'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午1:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK_PARAM_ADAPTER") +@Api(value="调度任务参数转换",description = "调度任务参数转换信息") +public class LacSuitTaskParamAdapter extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + @Column(name="PARAM_ID") + @ApiParam(value ="参数ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long paramId; + + @Column(name="PARAM_NAME") + @ApiParam(value ="参数名称") + private String paramName; + + @Column(name="PARAM_TYPE") + @ApiParam(value ="参数类型") + private Integer paramType; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private Integer paramValueType; + + @Column(name="TRANSFER_PARAM_NAME") + @ApiParam(value ="转换后参数名称") + private String transferParamName; + + @Column(name="TRANSFER_PARAM_VALUE_TYPE") + @ApiParam(value ="转换后参数值类型") + private String transferParamValueType; + + @Column(name="DEFAULT_VALUE") + @ApiParam(value ="参数默认值") + private String defaultValue; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java new file mode 100644 index 0000000..8df6834 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:55 + * @Modify: + **/ +public interface LacCommandStackStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java new file mode 100644 index 0000000..4db8217 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:55 + * @Modify: + **/ +public interface LacCommandStackStepTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java new file mode 100644 index 0000000..6aa60e8 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:56 + * @Modify: + **/ +public interface LacCommandStackTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java new file mode 100644 index 0000000..c4d52d5 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitCase; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:56 + * @Modify: + **/ +public interface LacSuitCaseRepository extends BaseRepository { +} + diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java new file mode 100644 index 0000000..887c5b6 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskParamAdapterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java new file mode 100644 index 0000000..d1026e0 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java new file mode 100644 index 0000000..c65e6c7 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskRepository extends BaseRepository { +} From 803d5c57f2579651c8adc474dd3ee959f9ff2fb7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 28 Oct 2019 17:45:13 +0800 Subject: [PATCH 82/82] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=821101=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E4=BD=9C=E4=B8=9A=EF=BC=8C?= =?UTF-8?q?=E7=AC=AC3=E6=AC=A1=E6=8F=90=E4=BA=A4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index 1928952..c8316cc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -50,5 +50,8 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("关闭按钮-提醒") private boolean closeButtonNoticeFlag; + @ApiParam("维修任务按钮") + private boolean repairButton; + }