From 0f82f3fbe5f0c5bf79d59f907885cb58ae6447ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 23 Sep 2019 17:18:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index ba26d44..a90feda 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -63,7 +63,7 @@ public class WmsDocMovementSn extends BaseBean { public String unit; /** - * 状态：操作状态 + * 状态：操作状态 itemStatus */ @Column(name="SN_STATUS") @ApiParam(value = "操作状态", example = "10") @@ -105,4 +105,9 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("ERP库存地") private String erpWhNo; + + @Column(name="SN_STATUS") + @ApiParam(value = "状态", example = "10") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + public Integer itemStatus; } From 153238d31a1fbb18e2251c52bca66e49b403003a Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 23 Sep 2019 20:39:11 +0800 Subject: [PATCH 2/3] add integration to aps --- .../cn/estsh/i3plus/pojo/aps/bean/DataLink.java | 52 ++++++++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/ExportDetail.java | 38 ++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/ExportProject.java | 26 +++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 32 +++++++++++++ .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 35 +++++++++++++++ .../estsh/i3plus/pojo/aps/bean/ImportProject.java | 26 +++++++++++ .../i3plus/pojo/aps/enums/DATA_LINK_TYPE.java | 8 ++++ .../i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java | 6 +++ .../i3plus/pojo/aps/holders/EExportProject.java | 6 +++ .../i3plus/pojo/aps/holders/EImportProject.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/model/APSPager.java | 10 +++++ .../pojo/aps/repository/DataLinkRepository.java | 9 ++++ .../aps/repository/ExportDetailRepository.java | 9 ++++ .../aps/repository/ExportProjectRepository.java | 9 ++++ .../aps/repository/ImportDetailRepository.java | 9 ++++ .../aps/repository/ImportProjectRepository.java | 9 ++++ .../src/main/resources/relations/ExportProject.xml | 7 +++ .../src/main/resources/relations/ImportProject.xml | 7 +++ .../src/main/resources/relations/Material.xml | 4 +- 19 files changed, 306 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DataLinkRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportDetailRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportProjectRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportDetailRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportProjectRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java new file mode 100644 index 0000000..5b38358 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.enums.DATA_LINK_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; + +/** + * @Description :数据集成数据连接信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_DATA_LINK") +@Api("数据集成数据连接信息") +public class DataLink extends BaseAPS { + @Column(name="NAME") + @ApiParam(value ="编码") + private String name; + + @Column(name="TYPE") + @ApiParam(value ="链接类型") + private DATA_LINK_TYPE type; + + @Column(name="PATH") + @ApiParam(value ="IP/文件路径") + private String path; + + @Column(name="PORT") + @ApiParam(value ="端口") + private Integer port; + + @Column(name="DB_NAME") + @ApiParam(value ="数据库名") + private String dbName; + + @Column(name="USER_NAME") + @ApiParam(value ="用户名") + private String userName; + + @Column(name="PASSWORD") + @ApiParam(value ="密码") + private String password; + +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java new file mode 100644 index 0000000..09486cf --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +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; + +/** + * @Description :数据导出明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_EXPORT_DETAIL") +@Api("数据导出明细") +public class ExportDetail extends BaseAPS { + @Column(name="FILTER") + @ApiParam(value ="筛选") + private String filter; + + @Column(name="SORT_BY") + @ApiParam(value ="排序") + private String sortBy; + + @Column(name="OUT_NAME") + @ApiParam(value ="外部表名") + private String outName; + + @Column(name="IN_NAME") + @ApiParam(value ="内部表名") + private String inName; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java new file mode 100644 index 0000000..de41803 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +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; + +/** + * @Description :数据导出明细集合 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_EXPORT_PROJECT") +@Api("数据导出明细集合") +public class ExportProject extends BaseAPS { + @Column(name="NAME") + @ApiParam(value ="标识名") + private String name; +} 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 639004f..93abff0 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 @@ -4,11 +4,13 @@ import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonIgnore; 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.lang.reflect.Method; @@ -28,14 +30,44 @@ import java.lang.reflect.Method; @Table(name="APS_FIELD_INFO") @Api("字段信息") public class FieldInfo extends BaseCode { + @Column(name="CLASS_NAME") + @ApiParam(value ="所属类简称") private String className; + + @Column(name="TYPE") + @ApiParam(value ="类型") private FIELD_TYPE type; + + @Column(name="TYPE_NAME") + @ApiParam(value ="类型全称") + private String typeName; + + @Column(name="CUSTOMIZE") + @ApiParam(value ="是否为自定义字段") private Boolean customize; + + @Column(name="MODIFY") + @ApiParam(value ="是否能修改") private Boolean modify; + + @Column(name="DISPLAY") + @ApiParam(value ="是否在界面显示") private Boolean display; + + @Column(name="PRIC") + @ApiParam(value ="浮点数显示精度") private Integer pric; + + @Column(name="TIPS") + @ApiParam(value ="字段提示") private String tips; + + @Column(name="EXPRESSION") + @ApiParam(value ="表达式") private String expression; + + @Column(name="POSITION") + @ApiParam(value ="位置") private String position; @JsonIgnore 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 new file mode 100644 index 0000000..b5cd53e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_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; + +/** + * @Description :数据导入明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_IMPORT_DETAIL") +@Api("数据导入明细") +public class ImportDetail extends BaseAPS { + @Column(name="TYPE") + @ApiParam(value ="导入类型") + private IMPORT_DETAIL_TYPE type; + + @Column(name="OUT_NAME") + @ApiParam(value ="外部表名") + private String outName; + + @Column(name="IN_NAME") + @ApiParam(value ="内部表名") + private String inName; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java new file mode 100644 index 0000000..85cef48 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +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; + +/** + * @Description :数据导入明细集合 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_IMPORT_PROJECT") +@Api("数据导入明细集合") +public class ImportProject extends BaseAPS { + @Column(name="NAME") + @ApiParam(value ="标识名") + private String name; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java new file mode 100644 index 0000000..6e031cf --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum DATA_LINK_TYPE { + CSV, + MYSQL, + ORACLE, + SQLSERVER +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java new file mode 100644 index 0000000..a23a8e9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java @@ -0,0 +1,6 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum IMPORT_DETAIL_TYPE { + REPLACE, + DIFF +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java new file mode 100644 index 0000000..be46ca5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java @@ -0,0 +1,6 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EExportProject { + Link, + Details +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java new file mode 100644 index 0000000..5f00e96 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java @@ -0,0 +1,6 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EImportProject { + Link, + Details +} 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 new file mode 100644 index 0000000..2cc398b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import lombok.Data; + +@Data +public class APSPager extends Pager { + private String filter; + private String sort; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DataLinkRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DataLinkRepository.java new file mode 100644 index 0000000..43953ec --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DataLinkRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.DataLink; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface DataLinkRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportDetailRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportDetailRepository.java new file mode 100644 index 0000000..59872a0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportDetailRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ExportDetail; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ExportDetailRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportProjectRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportProjectRepository.java new file mode 100644 index 0000000..81f9f2e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportProjectRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ExportProject; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ExportProjectRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportDetailRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportDetailRepository.java new file mode 100644 index 0000000..ce52ae4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportDetailRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ImportDetail; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ImportDetailRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportProjectRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportProjectRepository.java new file mode 100644 index 0000000..9692d0f --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportProjectRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ImportProject; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ImportProjectRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml new file mode 100644 index 0000000..4c21b36 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml new file mode 100644 index 0000000..8128db4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index f5a2928..7d7cb1e 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file From d676bcf9740f5be23dfede4936703222b130037e Mon Sep 17 00:00:00 2001 From: wangjie Date: Mon, 23 Sep 2019 20:47:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8B=E8=BE=BE=E9=85=8D=E7=BD=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 78 +++++++++++++++++++++- .../bean/{MesStatus.java => MesButtonStatus.java} | 42 +++++++----- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++ .../mes/repository/MesButtonStatusRepository.java | 17 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 +++++ 5 files changed, 139 insertions(+), 17 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesStatus.java => MesButtonStatus.java} (53%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.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 1083bf7..1022a46 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,82 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes按钮状态配置 判断符号 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_BUTTON_STATUS_JUDGE_FLAG { + + EQUAL("=", "等于"), + NOT_EQUAL("!=", "不等于"), + GREATER_THAN(">", "大于"), + NOT_LESS_THAN(">=", "大于大于"), + LESS_THAN("<", "小于"), + NOT_GREATER_THAN("<=", "小于等于"); + + private String value; + private String description; + + MES_BUTTON_STATUS_JUDGE_FLAG(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 (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * mes按钮状态配置 逻辑符号 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_BUTTON_STATUS_LOGIC_FLAG { + + AND("&&", "逻辑与"), + OR("||", "逻辑或"); + + private String value; + private String description; + + MES_BUTTON_STATUS_LOGIC_FLAG(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 (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * MesWorkOrder实体对应的approvalStatus值 审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -554,7 +630,7 @@ public class MesEnumUtil { } /** - * MesPlanOrder实体对应的source值 计划来源 + * MesWorkOrder实体对应的source值 计划来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_ORDER_SOURCE { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java similarity index 53% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 1f1d8c2..02745c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -14,7 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :mes状态配置表 + * @Description :mes按钮状态配置表 * @Reference : * @Author : wangjie * @CreateDate : 2019-09-19 @@ -25,26 +25,36 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_STATUS") -@Api("系统业务动作") -public class MesStatus extends BaseBean { - @Column(name="STATUS_CODE") - @ApiParam("状态代码") - private String statusCode; +@Table(name="MES_BUTTON_STATUS") +@Api("按钮状态配置表") +public class MesButtonStatus extends BaseBean { - @Column(name="STATUS_NAME") - @ApiParam("状态名称") - private String statusName; + @Column(name="BUTTON_CODE") + @ApiParam("按钮代码") + private String buttonCode; - @Column(name="STATUS_VALUE") - @ApiParam("状态值") - private Integer statusValue; + @Column(name="CLASS_NAME") + @ApiParam("实体类名称") + private String ClassName; @Column(name="STATUS_FIELD") @ApiParam("状态字段") private String statusField; - public int getStatusValueVal() { - return this.statusValue == null ? 0 : this.statusValue; - } + @Column(name="JUDGE_FLAG") + @ApiParam("判断符合") + private String judgeFlag; + + @Column(name="STATUS_VALUE") + @ApiParam("状态值") + private String statusValue; + + @Column(name="LOGIC_FLAG") + @ApiParam("逻辑符合") + private String logicFlag; + + @Column(name="STATUS_DESC") + @ApiParam("描述") + private String statusDesc; + } 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 13a3217..b22729f 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 @@ -187,6 +187,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("mes生产工单页面按钮控制") private MesWorkOrderButtonModel workOrderButtonModel; + @Transient + @ApiParam(value="下达按钮编号") + public String buttonCode; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.java new file mode 100644 index 0000000..5b33393 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesButtonStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description :按钮条件配置 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Repository +public interface MesButtonStatusRepository 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 0ee655a..7fc2765 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 @@ -1215,4 +1215,19 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } + + /** + * 按钮条件配置 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getMesButtonStatus(MesButtonStatus buttonStatus, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(buttonStatus, organizeCode); + if (StringUtils.isNotEmpty(buttonStatus.getButtonCode())) { + DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean); + } + packBean.setOrderByStr(buttonStatus.orderBy()); + return packBean; + } }