From 120ea87da80578fa2328262a8734d6784fa36eb0 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 18 Apr 2019 17:59:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=9B=86=E6=88=90=20Bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 22 ++++++++++++++++++++++ .../i3plus/pojo/form/bean/BfCascadeDetail.java | 15 ++++++++++++++- .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 5 +++-- .../i3plus/pojo/form/bean/BfElementProperty.java | 8 ++++++++ .../pojo/form/bean/BfElementPropertyVirtual.java | 6 ++++++ .../i3plus/pojo/form/bean/BfInterceptDetail.java | 8 ++++---- .../estsh/i3plus/pojo/model/form/ElementModel.java | 8 ++++++++ .../i3plus/pojo/model/form/SqlColumnModel.java | 8 ++++++++ 8 files changed, 73 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 4ab2c92..1b302cd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1216,6 +1216,18 @@ public class BlockFormEnumUtil { return description; } + public String getClassPath() { + return classPath; + } + + public Class getClzFullName() { + return clzFullName; + } + + public PROPERTY_CONTROL_TYPE getControlType() { + return controlType; + } + public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -1286,6 +1298,16 @@ public class BlockFormEnumUtil { return tmp; } + public static PROPERTY_TYPE valueOfClassPath(String classPath) { + PROPERTY_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].classPath == classPath) { + tmp = values()[i]; + } + } + return tmp; + } + public static PROPERTY_TYPE valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { 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 c5e200c..d6d796b 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 @@ -50,23 +50,36 @@ public class BfCascadeDetail extends BaseBean { @Column(name="DETAIL_GRADE") @ApiParam(value ="当前级联层级") - private Integer detail_grade; + private Integer detailGrade; @Column(name = "PARENT_ID") @ApiParam(value = "父级ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + @Column(name = "PARENT_NAME_RDD") + @ApiParam(value = "父级名称") + private String parentNameRdd; + @Column(name = "ELEMENT_PROPERTY_VALUE_ID") @ApiParam(value = "对象属性-元素属性ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long elementPropertyValueId; + @Column(name = "ELEMENT_PROPERTY_VALUE_Rdd") + @ApiParam(value = "对象属性-元素属性") + private String elementPropertyValueRdd; + @Column(name = "ELEMENT_PROPERTY_TEXT_ID") @ApiParam(value = "显示属性-元素属性ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long elementPropertyTextId; + @Column(name = "ELEMENT_PROPERTY_TEXT_RDD") + @ApiParam(value = "显示属性") + private String elementPropertyTextRdd; + + @Column(name="CASCADE_DETAIL_DESCRIPTION") @ApiParam(value ="级联描述") private String cascadeDetailDescription; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index f787cff..507a3a2 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -59,11 +59,12 @@ public class BfElement extends BaseBean { @Column(name="ELEMENT_ATTR_ID") @ApiParam(value ="默认排序属性") - private String elementAttrId; + @JsonSerialize(using = ToStringSerializer.class) + private Long elementAttrId; @Column(name="ELEMENT_SORT_TYPE") @ApiParam(value ="默认排序规则") - private String elementSortType; + private Integer elementSortType; @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 1ec1af9..3a2b46f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -129,7 +129,15 @@ public class BfElementProperty extends BaseBean { private String propertyCssStyle; @Transient + @ApiParam(value ="元素值") + private transient Object propertyFormValue; + + @Transient @ApiParam(value = "对象属性信息") @AnnoOutputColumn(hidden = true) private BfDataObjectProperty objectProperty; + + public Object getFormValue() { + return propertyFormValue == null ? propertyDefaultValue: propertyFormValue; + } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index f52cb1b..9f58432 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -38,6 +38,12 @@ public class BfElementPropertyVirtual extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long elementId; + //外键关联数据对象主键 + @Column(name = "DATA_OBJECT_ID") + @ApiParam(value = "数据对象ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long dataObjectId; + @Column(name="PROPERTY_CODE") @ApiParam(value ="类属性名称") private String propertyCode; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java index 8714cb2..c4a9495 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java @@ -70,10 +70,6 @@ public class BfInterceptDetail extends BaseBean { @ApiParam(value ="拦截器业务结果处理") private Integer interceptProcessResult; - @Transient - @ApiParam(value = "拦截器") - private BfIntercept intercept; - public int getInterceptProcessResultVal(){ if(interceptProcessResult == null ){ return 0; @@ -92,4 +88,8 @@ public class BfInterceptDetail extends BaseBean { return interceptExecuteSort.intValue(); } + @Transient + @ApiParam(value = "拦截器") + private BfIntercept intercept; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java index ec48bf9..0e41729 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.form.bean.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.util.List; /** @@ -16,6 +19,11 @@ import java.util.List; @Data public class ElementModel{ + //外键关联数据对象主键 + @ApiParam(value = "对象元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + @ApiParam(value = "元素基础信息") private BfElement element; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java index e1cca37..7c628f7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.form; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -57,5 +58,12 @@ public class SqlColumnModel { @ApiParam(value = "属性默认值") private Object defaultValue; + public SqlColumnModel() { + } + public SqlColumnModel(String columnName, BlockFormEnumUtil.PROPERTY_TYPE type) { + this.columnName = columnName; + this.columnClassType = type.getValue(); + this.columnTypeName = type.getDescription(); + } } From 7e14a06a8de3a5115adf76c50f271286ee86930c Mon Sep 17 00:00:00 2001 From: jiajack Date: Thu, 18 Apr 2019 18:02:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index ef34e81..8a331df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -40,6 +40,9 @@ public class MesMethod extends BaseBean { @ApiParam("具体实现类") private String callClass; + /** + * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） + */ @Column(name="METHOD_TYPE") @ApiParam("方法类型") private Integer methodType; From 7535d82bed61fc64d709fa27eb00418a51d7eb3d Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 18 Apr 2019 19:40:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E5=8F=91=E5=B8=83=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=98=E5=9C=A8=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 9ebcb79..0fb4abe 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.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 : @@ -101,4 +102,8 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "PACKAGE_NO") @ApiParam(value = "包装编号") public String packageNo; + + @Transient + @ApiParam(value = "是否可编辑（前端使用）") + public boolean isSet = false; } 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 fcd1b33..dfa8162 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 @@ -48,8 +48,9 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), - purchaseOrder.getExpectedTimeEnd(), "expectedTime", result,false); + purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(purchaseOrder, result); } @@ -58,6 +59,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(swebPackage, result); } @@ -71,6 +73,7 @@ public class SwebHqlPack { // 封装有效状态和删除状态 DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(model, result); } @@ -78,12 +81,14 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(swebProcurementPlanOrder, result); } public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(swebProcurementPlanOrderDetails, result); } @@ -91,6 +96,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(vendorRel, result); } From b17d65356ae1b86e066dd7b63e47c58475152637 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 19 Apr 2019 09:08:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9Eget=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 2f88eb6..f670744 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -81,4 +81,8 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_PART") @ApiParam(value = "是否散件") private Integer isPart; + + public Integer getIsInventoryVal() { + return this.isInventory == null ? 0 :this.isInventory.intValue(); + } }