From ec3ef597e8e4464e5e2ce73b55babd5abafd04e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 21 Sep 2019 05:18:30 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 39 ++++++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) 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 53adc22..43dfd15 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 @@ -37,7 +37,7 @@ import java.util.List; @Index(columnList = "FIX_LOT_NO"), @Index(columnList = "DATE_CODE"), @Index(columnList = "VENDOR_NO") - }) +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -118,26 +118,26 @@ public class WmsStockSn extends BaseBean { */ @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") private Integer qcStatus; /** * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") private Integer snStatus; /** * 1:已打印；2：未打印 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer printed; @Column(name = "PDATE") @ApiParam(value = "打印时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pdate; /** * 1=ASN,10=PO,20=SO @@ -160,7 +160,7 @@ public class WmsStockSn extends BaseBean { @Column(name = "SN_TYPE") @ApiParam(value = "条码类型", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") private Integer snType = 10; @ApiParam(value = "仓库名称") @@ -246,9 +246,10 @@ public class WmsStockSn extends BaseBean { @Transient private Integer isSnapshot; - public WmsStockSn(){} + public WmsStockSn() { + } - public WmsStockSn(String partNo){ + public WmsStockSn(String partNo) { this.partNo = partNo; } @@ -256,17 +257,33 @@ public class WmsStockSn extends BaseBean { return isSnapshot == null ? 0 : isSnapshot.intValue(); } - public Integer getSnType() { return snType == null ? 0 : snType.intValue();} + public Integer getSnType() { + return snType == null ? 0 : snType.intValue(); + } public Double getQty() { return qty == null ? 0L : qty.doubleValue(); } - public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();} + public Double getInputNCQty() { + return inputNCQty == null ? 0L : this.inputNCQty.doubleValue(); + } - public WmsStockSn( Long snCount, Double sumPartQty,String locateNo) { + public WmsStockSn(Long snCount, Double sumPartQty, String locateNo) { this.snCount = snCount; this.sumPartQty = sumPartQty; this.locateNo = locateNo; } + + //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid + public WmsStockSn(String locateNo, String partNo, Integer snStatus, + Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) { + this.locateNo = locateNo; + this.partNo = partNo; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.isDeleted = isDeleted; + this.isValid = isValid; + } } 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 2/6] =?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 3/6] 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 4/6] =?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; + } } From 522efe67b6926fe01d433bea2c8199c5f3f85fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 24 Sep 2019 10:04:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?excel=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96--?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 a90feda..e6ba0ab 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 @@ -106,8 +106,7 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("ERP库存地") private String erpWhNo; - @Column(name="SN_STATUS") - @ApiParam(value = "状态", example = "10") + @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; } From f8b385d2748252dba8500c1b1f8d4096e98e1f60 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 24 Sep 2019 10:47:48 +0800 Subject: [PATCH 6/6] add integration to aps --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/bean/DataLink.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java | 16 ++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/ExportProject.java | 21 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 1 + .../estsh/i3plus/pojo/aps/bean/ImportProject.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/OperResource.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 1 + .../i3plus/pojo/aps/bean/OvertimeCalendar.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 1 + .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 1 + .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 1 + .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/WorkResource.java | 1 + .../i3plus/pojo/aps/{bean => common}/BaseAPS.java | 2 +- .../i3plus/pojo/aps/{bean => common}/BaseCode.java | 2 +- .../i3plus/pojo/aps/holders/EExportDetail.java | 5 +++++ 30 files changed, 92 insertions(+), 2 deletions(-) rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/{bean => common}/BaseAPS.java (92%) rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/{bean => common}/BaseCode.java (93%) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java 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 dbbfd15..aa093ab 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 @@ -1,11 +1,15 @@ 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.EBaseOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; import java.util.Date; +import java.util.List; /** * @Description :订单基类 @@ -48,4 +52,8 @@ public class BaseOrder extends BaseAPS { @Column(name="RECEIVE_DATE") @ApiParam(value ="接单日期") private Date receiveDate; + + public List getWorks() { + return BeanRelation.list(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index 4c22dbe..451a8f4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; + /** * @Description :规则基类 * @Reference : diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 5b38358..3486531 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.enums.DATA_LINK_TYPE; 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/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index 8e4f1e5..ff9e9c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -1,5 +1,6 @@ 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; 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 index 09486cf..d6926c9 100644 --- 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 @@ -1,5 +1,8 @@ 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.EExportDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,4 +38,17 @@ public class ExportDetail extends BaseAPS { @Column(name="IN_NAME") @ApiParam(value ="内部表名") private String inName; + + @Column(name="PROJECT_ID") + @ApiParam(value ="导出项目ID") + private Long projectId; + + public ExportProject getProject() { + return BeanRelation.get(this, EExportDetail.Project); + } + + public void setProject(ExportProject project) { + this.projectId = project != null ? project.getId() : 0l; + BeanRelation.set(this, EExportDetail.Project, project); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index de41803..7438e17 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -1,5 +1,8 @@ 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.EExportProject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -7,6 +10,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :数据导出明细集合 @@ -23,4 +27,21 @@ public class ExportProject extends BaseAPS { @Column(name="NAME") @ApiParam(value ="标识名") private String name; + + @Column(name="LINK_ID") + @ApiParam(value ="数据源连接") + private Long linkId; + + public DataLink getLink() { + return BeanRelation.get(this, EExportProject.Link); + } + + public void setLink(DataLink link) { + this.linkId = link != null ? link.getId() : 0l; + BeanRelation.set(this, EExportProject.Link, link); + } + + public List getDetails() { + return BeanRelation.list(this, EExportProject.Details); + } } 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 93abff0..664b43b 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.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 index b5cd53e..102cd83 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE; 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/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 85cef48..bb21896 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -1,5 +1,6 @@ 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; 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 9d0a98e..c0ae1a0 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.common.BaseCode; import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE; import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 5ee1d01..1c8cdc3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; 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/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 143141e..82ab4cf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -1,5 +1,6 @@ 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; 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 4cf9c04..4de47b0 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 @@ -1,5 +1,6 @@ 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; 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 2c0b4f3..cba41d4 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index 0d4cfc5..1c17473 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_TYPE; 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/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index a651c37..dd7e68d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import lombok.Data; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 64667de..88a415c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseCode; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; 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 52920f1..7edd19f 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,5 +1,6 @@ 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; 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 d5dce47..5949b15 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 @@ -1,5 +1,6 @@ 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_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 0d40f77..70eb6ad 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import lombok.Data; 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 de95109..4a0d1e5 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.enums.DIRECTION; import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_LOCK_TYPE; import cn.estsh.i3plus.pojo.aps.enums.RES_COMB_TIME_TYPE; 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 cd62bbe..799f34a 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.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; 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 1000974..60ca0c0 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 @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS; import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EWork; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -90,4 +93,17 @@ public class Work extends BaseCode { @Column(name="PLAN_RESOURCE") @ApiParam(value ="计划主资源") private String planResource; + + @Column(name="ORDER_ID") + @ApiParam(value ="订单") + private Long orderId; + + public BaseOrder getOrder() { + return BeanRelation.get(this, EWork.Order); + } + + public void setOrder(BaseOrder order) { + this.orderId = order != null ? order.getId() : 0l; + BeanRelation.set(this, EWork.Order, order); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index b58669d..b37c70d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -1,5 +1,6 @@ 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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index bbd1456..16023ec 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -1,5 +1,6 @@ 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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index fb2a296..07095c3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE; import io.swagger.annotations.Api; 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 651a0b6..34842fb 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 @@ -1,5 +1,6 @@ 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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java similarity index 92% rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseAPS.java rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index a32f16d..3b46af2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.aps.bean; +package cn.estsh.i3plus.pojo.aps.common; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import lombok.Data; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java similarity index 93% rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseCode.java rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index b98245e..b434092 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.aps.bean; +package cn.estsh.i3plus.pojo.aps.common; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java new file mode 100644 index 0000000..70098c7 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EExportDetail { + Project +}