From 6944deef5475be129259928374bde34e43b45b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 2 Apr 2019 09:03:27 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= 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 | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 13 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 1a0230a..036230c 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 @@ -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; /** * @Description : 移库单条码表 @@ -66,4 +67,8 @@ public class WmsDocMovementSn extends BaseBean { @Column(name="SN") @ApiParam("条码") public String sn; + + @Transient + @ApiParam("前端表格编辑使用") + private Boolean isSet = false; } 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 e181f09..2a8209b 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 @@ -122,6 +122,13 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "供应商批次") public String dateCode; + @Transient + @ApiParam("前端表格编辑使用") + public Boolean isSet = false; + + @Transient + @ApiParam("供应商批次字段是否可编辑") + public Boolean isDateCodeEdit = true; public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; } } 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 75ab922..51f5e00 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 @@ -163,7 +163,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result); - HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart", result); HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); From 1f11a6f28074c40dfbbf0fbc0e05720fb0fe67d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 2 Apr 2019 11:31:38 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 089b84c..15a11c4 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 @@ -170,6 +170,10 @@ public class WmsStockSn extends BaseBean { @Transient public Double inputNCQty; + @ApiParam(value = "前端散件表格是否编辑") + @Transient + public Boolean isSet = false; + public WmsStockSn(){} public WmsStockSn(String partNo){ 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 51f5e00..7f4799e 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 @@ -1033,7 +1033,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "", WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result); - HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart",result); //单号 HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsQCMaster, result); From fb095c6bfb8c61258c2b0f25284c0f40a4337bd3 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 2 Apr 2019 13:20:45 +0800 Subject: [PATCH 3/9] =?UTF-8?q?Sweb=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4bean+hql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/sweb/bean/SwebPackage.java | 2 ++ .../sweb/bean/SwebProcurementPlanOrderDetails.java | 2 ++ .../pojo/sweb/bean/SwebPurchaseChangeLog.java | 2 ++ .../modelbean/SwebPurchaseForPubListModel.java | 14 ++++++++ .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 37 +++++++++++++++++++--- 5 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java index a420d5e..7eadec2 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java @@ -5,6 +5,7 @@ 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; @@ -40,6 +41,7 @@ public class SwebPackage extends BaseBean { @ApiParam("上级包装编号") public String parentPackageNo; + @ColumnDefault("0") @Column(name="PACKAGE_QTY") @ApiParam(value = "包装件数", example = "1") public Integer packageQty; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java index 144cf36..6143e86 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java @@ -5,6 +5,7 @@ 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; @@ -44,6 +45,7 @@ public class SwebProcurementPlanOrderDetails extends BaseBean { @Column(name = "UNIT") private String unit; + @ColumnDefault("0") @ApiParam("标准包装") @Column(name = "SNP_QTY") private Double snpQty; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java index 800016a..8ab6d57 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java @@ -5,6 +5,7 @@ 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; @@ -38,6 +39,7 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "QTY") @ApiParam("零件数量") + @ColumnDefault("0") public Double qty; @Column(name = "REMARK") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java new file mode 100644 index 0000000..4dca685 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-02 13:13 + * @Modify: + **/ +@Data +public class SwebPurchaseForPubListModel { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 0468770..48f0d78 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; -import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder; +import cn.estsh.i3plus.pojo.sweb.bean.*; import org.apache.commons.lang3.StringUtils; /** @@ -18,11 +18,12 @@ public class SwebHqlPack { /** * 通用封装isValid、isDeleted等参数 + * * @param bean * @param hqlStr * @return */ - private static String buildHql(BaseBean bean, StringBuffer hqlStr){ + private static String buildHql(BaseBean bean, StringBuffer hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); @@ -34,11 +35,39 @@ public class SwebHqlPack { return hqlStr.toString(); } - public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder){ + public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); - return buildHql(purchaseOrder,result); + return buildHql(purchaseOrder, result); + } + + public static String getPackAgeWhereHql(SwebPackage swebPackage) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); + HqlPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); + HqlPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); + return buildHql(swebPackage, result); + } + + public static String getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); + HqlPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); + return buildHql(swebProcurementPlanOrder, result); + } + + public static String getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); + return buildHql(swebProcurementPlanOrderDetails, result); + } + + public static String getVendorRelWhereHql(SwebVendorRel vendorRel) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); + HqlPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); + return buildHql(vendorRel, result); } } From 6b8ac6240de8758c76c07efd1c697d966aea3e7e Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 2 Apr 2019 13:34:14 +0800 Subject: [PATCH 4/9] =?UTF-8?q?LINK=5FORDER=5FTYPE=E6=97=A0=E9=9C=80?= =?UTF-8?q?=E6=95=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 56 +++++++--------------- 1 file changed, 16 insertions(+), 40 deletions(-) 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 afc39d4..a7bf29d 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 @@ -80,7 +80,6 @@ public class WmsEnumUtil { } - /** * 主表信息 单据类型 */ @@ -584,60 +583,37 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LINK_ORDER_TYPE { - ASN(10, "ASN", "ASN"), - PO(20, "PO", "PO"), - SO(30, "SO", "SO"), - MOVE(40, "MOVE", "MOVE"), - IN_STOCK(50, "IN_STOCK", "IN_STOCK"), - SHIPPING(60, "SHIPPING", "SHIPPING"), - QC(70, "QC", "QC"), - CS(80, "CS", "CS"); - private int value; - private String code; + ASN("ASN", "ASN"), + PO("PO", "PO"), + SO("SO", "SO"), + MOVE("MOVE", "MOVE"), + IN_STOCK("IN_STOCK", "IN_STOCK"), + SHIPPING("SHIPPING", "SHIPPING"), + QC("QC", "QC"), + CS("CS", "CS"); + private String value; private String description; - LINK_ORDER_TYPE(int value, String code, String description) { + LINK_ORDER_TYPE(String value, String description) { this.value = value; - this.code = code; this.description = description; } - public int getValue() { - return value; - } - public String getDescription() { return description; } public String getCode() { - return code; - } - - 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; + return value; } - 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 String getValue() { + return value; } - public static LINK_ORDER_TYPE codeOf(String code) { - int tmp = 1; + public static LINK_ORDER_TYPE codeOf(String value) { for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { + if (values()[i].value.equals(value)) { return values()[i]; } } @@ -720,7 +696,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { - CREATE(10,"创建"), + CREATE(10, "创建"), QUALITY_CONTROL(20, "质检中"), PRE_INSTOCK(30, "待入库"), INSTOCKED(40, "入库"), From 956c8c0362484ababcfc98520f047c71c4a8112f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 2 Apr 2019 14:17:14 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 036230c..9233e83 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 @@ -71,4 +71,16 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + + @Transient + @ApiParam("源库位代码") + public String srcLocateNo; + + @Transient + @ApiParam("生产日期") + public String dateCode; } From c43a166a2501c7389970147051c26b3eaa3e2a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 2 Apr 2019 15:16:17 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E5=8C=96module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 4e5bc8c..32a91fa 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 @@ -57,10 +57,18 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "处理数量", example = "0") public Double transQty; + public Double getTransQty(){ + return this.transQty == null ? 0 : this.transQty.doubleValue(); + } + @Column(name="REJECT_QTY") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; + public Double getRejectQty(){ + return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); + } + @Column(name="UNIT") @ApiParam("单位") public String unit; From 60ca989dfc0ebfac8e93186d58868705a659fbfc Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 2 Apr 2019 16:38:49 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=20=E4=B8=8D?= =?UTF-8?q?=E6=87=82=E8=AF=B7=E7=9C=8B=E6=8F=90=E4=BA=A4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/BfElement.java | 73 ++++++++++++++++++++++ .../pojo/mes/repository/BfElementRepository.java | 14 +++++ 2 files changed, 87 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BfElement.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BfElement.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BfElement.java new file mode 100644 index 0000000..02bd079 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BfElement.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-03-21 13:14 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BF_ELEMENT") +@Api(value = "对象元素基础", description = "元素基础表") +public class BfElement extends BaseBean { + + //外键关联数据对象主键 + @Column(name = "ELEMENT_INFO_ID") + @ApiParam(value = "对象元素明细ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementInfoId; + + //外键关联数据对象主键 + @Column(name = "DATA_OBJECT_ID") + @ApiParam(value = "数据对象ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long dataObjectId; + + @Column(name="ELEMENT_TYPE") + @ApiParam(value ="元素类型") + private Integer elementType; + + @Column(name="ELEMENT_NAME") + @ApiParam(value ="元素名称") + private String elementName; + + @Column(name="ELEMENT_CODE") + @ApiParam(value ="元素编码") + private String elementCode; + + @Column(name="ELEMENT_ATTR_ID") + @ApiParam(value ="默认排序属性") + private String elementAttrId; + + @Column(name="ELEMENT_SORT_TYPE") + @ApiParam(value ="默认排序规则") + private String elementSortType; + + @Column(name="ELEMENT_CSS_STYLE") + @ApiParam(value ="元素样式") + private String elementCssStyle; + + @Column(name="ELEMENT_DESCRIPTION") + @ApiParam(value ="元素描述") + private String elementDescription; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.java new file mode 100644 index 0000000..0132694 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.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.BfElement; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-03-21 15:24 + * @Modify: + **/ +public interface BfElementRepository extends BaseRepository { +} From b04895c67cdbbe5f95fae4d892f211bcb0ccbe97 Mon Sep 17 00:00:00 2001 From: jiajack Date: Tue, 2 Apr 2019 16:47:15 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesArea.java | 38 +++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 45 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 49 ++++++++++++++++++++++ .../pojo/mes/repository/MesAreaRepository.java | 16 +++++++ .../pojo/mes/repository/MesWorkCellRepository.java | 17 ++++++++ .../mes/repository/MesWorkCenterRepository.java | 17 ++++++++ 6 files changed, 182 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java 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 new file mode 100644 index 0000000..8f2288b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -0,0 +1,38 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean { + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; +} 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 new file mode 100644 index 0000000..4ec6e23 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -0,0 +1,45 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL") +@Api("工作单元") +public class MesWorkCell extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; +} 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 new file mode 100644 index 0000000..bc33bca --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -0,0 +1,49 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CENTER") +@Api("工作中心") +public class MesWorkCenter extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "ERP_WORK_CENTER") + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @Column(name = "WORK_VER") + @ApiParam("工作版本") + private String workVer; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java new file mode 100644 index 0000000..b1237f5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.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.MesArea; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java new file mode 100644 index 0000000..f97c4db --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.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.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface MesWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java new file mode 100644 index 0000000..5598e1e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.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.MesWorkCell; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface MesWorkCenterRepository extends BaseRepository { +} From 6f823a5ed91952164c3dbe908ea6978278fe6fe2 Mon Sep 17 00:00:00 2001 From: jiajack Date: Tue, 2 Apr 2019 16:49:13 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/MachineFactory.java | 66 ---------------------- .../java/cn/estsh/i3plus/pojo/mes/WorkPlan.java | 20 ------- 2 files changed, 86 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java deleted file mode 100644 index efc83a4..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package cn.estsh.i3plus.pojo.mes; - - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify: - **/ -@Entity -@Table(name="machine_factory") -@Api("工厂") -public class MachineFactory extends BaseBean { - - @Column(name="factory_code") - @ApiParam("工厂代码") - private String factoryCode; - - @Column(name="factory_name") - @ApiParam("工厂名称") - private String factoryName; - - public MachineFactory() { - } - - public MachineFactory(String factoryCode, String factoryName) { - this.factoryCode = factoryCode; - this.factoryName = factoryName; - } - - public String getFactoryCode() { - return factoryCode; - } - - public void setFactoryCode(String factoryCode) { - this.factoryCode = factoryCode; - } - - public String getFactoryName() { - return factoryName; - } - - public void setFactoryName(String factoryName) { - this.factoryName = factoryName; - } - - @Override - public String toString() { - return "MachineFactory{" + - "factoryCode='" + factoryCode + '\'' + - ", factoryName='" + factoryName + '\'' + - ", id=" + id + - ", createDate='" + createDatetime + '\'' + - ", modifyDate='" + modifyDatetime + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java deleted file mode 100644 index a2e02f2..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.estsh.i3plus.pojo.mes; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify:: - **/ -public class WorkPlan { - private String desc; - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } -}