From fb095c6bfb8c61258c2b0f25284c0f40a4337bd3 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 2 Apr 2019 13:20:45 +0800 Subject: [PATCH] =?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); } }