From 6396fb1a385b8bded5074234833def0602994c17 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 23 Apr 2019 20:37:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9CsnControl=E2=80=9D=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 12cca86..7769d40 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 @@ -241,6 +241,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result); @@ -1029,6 +1030,7 @@ public class WmsHqlPack { /** * 针对质检查询库存移动条码条件封装 + * * @param sn * @return */ From 6204ff8538ab800706114c98d054b1649dfc7f63 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 24 Apr 2019 14:37:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?#3961+MASTER=5FORDER=5FNO=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 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 dd4ba2e..389d72a 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 @@ -139,17 +139,19 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "处理中"), - RECEIPT_FINISH(30, "已完成"), - CLOSED(40, "已关闭"), - CANCELLED(50, "已取消"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "处理中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), + CLOSED(40, "CLOSED", "已关闭"), + CANCELLED(50, "CANCELLED", "已取消"); private int value; + private String code; private String description; - MASTER_ORDER_STATUS(int value, String description) { + MASTER_ORDER_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -161,6 +163,10 @@ public class WmsEnumUtil { return description; } + public String getCode() { + return code; + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From ee33834f9a4b629ea39f7a711fcede3fe0984eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 24 Apr 2019 15:27:54 +0800 Subject: [PATCH 3/5] =?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/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 12cca86..4f2c0c6 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 @@ -1028,7 +1028,7 @@ public class WmsHqlPack { } /** - * 针对质检查询库存移动条码条件封装 + * 针对质检查询库存移动条码条件封装(特殊处理) * @param sn * @return */ From c119c061302cb63668b9cea29d1f28f623cf0a74 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 24 Apr 2019 17:47:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=20=E4=BD=BF=E7=94=A8Redis=201.0=20=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/dynamic/DynamicEntity.java | 2 +- .../cn/estsh/i3plus/pojo/form/bean/BfCascade.java | 2 +- .../estsh/i3plus/pojo/form/bean/BfDataObject.java | 5 ++++ .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 34 +++++++++++++++++++--- .../estsh/i3plus/pojo/form/bean/BfElementGrid.java | 12 -------- .../estsh/i3plus/pojo/model/form/ElementModel.java | 5 +++- 6 files changed, 41 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 5665951..c603b99 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -182,7 +182,7 @@ public class DynamicEntity extends BaseBean implements Serializable { public boolean isDefaultField(String fieldName){ if (!ATTR_PREFIX.equals(fieldName)) { if("propertyList".equals(fieldName) || "dynProperty".equals(fieldName) || "childList".equals(fieldName) - || "LOGGER".equals(fieldName)){ + || "LOGGER".equals(fieldName) || "ATTR_PREFIX".equals(fieldName)){ return true; } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java index 7317e1b..44bd93e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java @@ -53,5 +53,5 @@ public class BfCascade extends BaseBean { @Transient @ApiParam(value = "元素详细") @AnnoOutputColumn(hidden = true) - private List detailList; + private List childList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index 6648ee4..7208908 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -68,4 +68,9 @@ public class BfDataObject extends BaseBean { @AnnoOutputColumn(hidden = true) private List propertyList; + @Transient + @ApiParam(value = "元素对象虚拟属性") + @AnnoOutputColumn(hidden = true) + List virtualList; + } 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 507a3a2..7f8fbae 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 @@ -45,6 +45,16 @@ public class BfElement extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long dataObjectId; + //外键关联数据对象主键 + @Column(name = "ELEMENT_PROPERTY_PRIMARY_KEY") + @ApiParam(value = "元素主键Key ", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementPropertyPrimaryKey; + + @Column(name="ELEMENT_PROPERTY_PRIMARY_KEY_NAME_RDD") + @ApiParam(value ="元素主键Key名称") + private String elementPropertyPrimaryKeyNameRdd; + @Column(name="ELEMENT_TYPE") @ApiParam(value ="元素类型") private Integer elementType; @@ -57,14 +67,30 @@ public class BfElement extends BaseBean { @ApiParam(value ="元素编码") private String elementCode; - @Column(name="ELEMENT_ATTR_ID") + @Column(name = "IS_OBJECT_ADD") + @ApiParam(value = "是否新增") + private Integer isObjectAdd; + + @Column(name = "IS_OBJECT_EDIT") + @ApiParam(value = "是否编辑") + private Integer isObjectEdit; + + @Column(name = "IS_OBJECT_DEL") + @ApiParam(value = "是否删除") + private Integer isObjectDel; + + @Column(name="ELEMENT_SORT_ATTR_ID") @ApiParam(value ="默认排序属性") @JsonSerialize(using = ToStringSerializer.class) - private Long elementAttrId; + private Long elementSortAttrId; + + @Column(name="ELEMENT_SORT_ATTR_CODE_RDD") + @ApiParam(value ="默认排序属性名称") + private String elementSortAttrCodeRdd; - @Column(name="ELEMENT_SORT_TYPE") + @Column(name="ELEMENT_SORT_ATTR_TYPE") @ApiParam(value ="默认排序规则") - private Integer elementSortType; + private Integer elementSortAttrType; @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") 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 d0eb771..86a7c19 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 @@ -44,18 +44,6 @@ public class BfElementGrid extends BaseBean { @ApiParam(value = "是否单选") private Integer isLineMultiple; - @Column(name = "IS_OBJECT_ADD") - @ApiParam(value = "是否新增") - private Integer isObjectAdd; - - @Column(name = "IS_OBJECT_EDIT") - @ApiParam(value = "是否编辑") - private Integer isObjectEdit; - - @Column(name = "IS_OBJECT_DEL") - @ApiParam(value = "是否删除") - private Integer isObjectDel; - @Column(name = "IS_OBJECT_FIND") @ApiParam(value = "是否查询") private Integer isObjectFind; 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 0e41729..82e59d5 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 @@ -39,8 +39,11 @@ public class ElementModel{ @ApiParam(value = "元素基础虚拟属性信息") private List virtualList; + @ApiParam(value = "级联信息集合") + private List cascadeList; + @ApiParam(value = "动态对象Class") - private Class dynClass; + private transient Class dynClass; @ApiParam(value = "数据对象信息") private BfDataObject dataObject; From 0744d38714c4ad2547b0505e73de9657552d9576 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 24 Apr 2019 17:51:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=89=8D=E5=90=8E=E7=AB=AF=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E6=8E=89=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E6=8A=8A=E5=85=B3=E8=81=94=E5=8D=95=E5=8F=B7=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=8F=AF=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 -- 2 files changed, 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index d8a367b..198fd32 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -72,10 +72,6 @@ public class WmsQCMaster extends BaseBean { @ApiParam("关联单号") public String refSrc; - @Column(name = "IB_NO") - @ApiParam("入库单号") - public String ibNo; - @Transient @ApiParam(value = "客户简称") private String custName; 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 4f2c0c6..5af3c38 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 @@ -1066,8 +1066,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); - //入库单号 - HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result); getStringBuilderPack(wmsQCMaster, result);