From 9beafd1bc6ba985f5115e45f59e835ac1d93ec54 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 1 Apr 2019 18:02:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=20=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=20=E5=BE=AE=E6=9C=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E5=B9=B3=E5=8F=B0=E8=A7=92=E8=89=B2=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/bean/BfRefMethodRole.java | 21 ++++++++-------- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 29 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java index d41e560..929fe5c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java @@ -9,7 +9,6 @@ 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; @@ -26,26 +25,26 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_REF_METHOD_ROLE") -@Api(value="功能角色关系",description = "功能角色关系") +@Table(name = "BF_REF_METHOD_ROLE") +@Api(value = "功能角色关系", description = "功能角色关系") public class BfRefMethodRole extends BaseBean { - @Column(name="METHOD_ID") - @ApiParam(value ="表单功能id") + @Column(name = "METHOD_ID") + @ApiParam(value = "表单功能id") @JsonSerialize(using = ToStringSerializer.class) private Long methodId; - @Column(name="METHOD_NAME_RDD") - @ApiParam(value ="表单功能名称") + @Column(name = "METHOD_NAME_RDD") + @ApiParam(value = "表单功能名称") private String methodNameRdd; - @Column(name="ROLE_ID") - @ApiParam(value ="角色id") + @Column(name = "ROLE_ID") + @ApiParam(value = "角色id") @JsonSerialize(using = ToStringSerializer.class) private Long roleId; - @Column(name="ROLE_NAME_RDD") - @ApiParam(value ="角色名称") + @Column(name = "ROLE_NAME_RDD") + @ApiParam(value = "角色名称") private String roleNameRdd; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 6fdcbef..428758e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -45,6 +45,35 @@ public final class FormHqlPack { } /** + * In 参数封装 + * @param columnName 列名 + * @param params 参数 + * @param isDeleted 数据状态 + * @return hql + */ + public static String packHqlIdsAndIsDeleted(String columnName, String[] params, Integer isDeleted) { + StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params)); + + HqlPack.getNumEqualPack(isDeleted, "isDeleted", result); + return result.toString(); + } + + + /** + * In 参数封装 + * @param columnName 列名 + * @param params 参数 + * @param isDeleted 数据状态 + * @return hql + */ + public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) { + StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params)); + + HqlPack.getNumEqualPack(isDeleted, "isDeleted", result); + return result.toString(); + } + + /** * 表单布局复杂查询 * @param bfLayout 表单布局 * @return hql From 1e797d0dac5fdd7759d3af8fa442c88392a8b613 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 1 Apr 2019 18:27:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BA=A7=E8=81=94=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90(=E6=9C=AA=E6=B5=8B?= =?UTF-8?q?=E8=AF=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java | 8 ++++++-- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java index 315d8e3..c5e200c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java @@ -33,13 +33,17 @@ public class BfCascadeDetail extends BaseBean { @Column(name = "CASCADE_ID") @ApiParam(value = "级联ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long cascade_id; + private Long cascadeId; @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long elementId; + @Column(name = "DETAIL_LABEL_TEXT") + @ApiParam(value = "提示信息") + private String detailLabelText; + @Column(name="ELEMENT_NAME") @ApiParam(value ="元素名称") private String elementName; @@ -51,7 +55,7 @@ public class BfCascadeDetail extends BaseBean { @Column(name = "PARENT_ID") @ApiParam(value = "父级ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long parent_id; + private Long parentId; @Column(name = "ELEMENT_PROPERTY_VALUE_ID") @ApiParam(value = "对象属性-元素属性ID", example = "-1") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index 69d0ca8..a979a2c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java @@ -46,7 +46,7 @@ public class BfElementGrid extends BaseBean { @Column(name = "IS_OBJECT_EDIT") @ApiParam(value = "是否编辑") - private Integer isObject_edit; + private Integer isObjectEdit; @Column(name = "IS_OBJECT_DEL") @ApiParam(value = "是否删除") From 98d4f691f120ae868a3d435f84fa145a293ec765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 1 Apr 2019 18:38:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= 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 | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 --------- 2 files changed, 2 insertions(+), 9 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 09e3519..089b84c 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 @@ -177,4 +177,6 @@ public class WmsStockSn extends BaseBean { } public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } + + public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index e74178b..98e919a 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 @@ -1036,15 +1036,6 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result); //单号 HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); - //业务类型 - HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); - //关联单据类型 - HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); - //关联单据号 - HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); - //入库单号 - HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result); - getStringBuilderPack(wmsQCMaster, result); return result.toString();