From 712ec2af7e5a28c71ba64db3b45d255a71e5e582 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sat, 6 Apr 2019 18:12:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7eacb2d..231b6d1 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 @@ -141,7 +141,7 @@ public class WmsEnumUtil { public enum MASTER_ORDER_STATUS { CREATE(10, "新建"), RECEIPT(20, "处理中"), - RECEIPT_FINISH(30, "已处理"), + RECEIPT_FINISH(30, "已完成"), CLOSED(40, "已关闭"), CANCELLED(50, "已取消"); From 678d154b1fe9f522920fcbbb1bbbec2ad92191f5 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Mon, 8 Apr 2019 15:48:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=9A=E6=89=80=E6=9C=89=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=92=8C=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=A1=8C=E5=8F=B7;=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E7=9A=84=E6=98=8E=E7=BB=86=E7=9A=84?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=8D=E8=B4=B9=E5=AD=97=E6=AE=B5=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E8=AE=A1=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 1c58e3c..eea64a4 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 @@ -86,7 +86,6 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); @@ -647,7 +646,6 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsASNMasterDetails.getItem(), "item", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); @@ -989,7 +987,6 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItem(), "item", result); HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); @@ -1020,7 +1017,6 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result); HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); @@ -1099,11 +1095,10 @@ public class WmsHqlPack { */ public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { StringBuffer result = new StringBuffer(); - //单号 HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); - //行号 - HqlPack.getNumEqualPack(wmsQCTrans.getItem(), "item", result); + //物料 + HqlPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result); getStringBuilderPack(wmsQCTrans, result); From ea31519fdcaddb5750ff557ce6ffc101c16102a7 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 4 Apr 2019 18:58:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/form/bean/BfMethodDetailProperty.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index d73b51f..6f59cbe 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -54,6 +54,16 @@ public class BfMethodDetailProperty extends BaseBean { @ApiParam(value ="主对象元素名称") private String priElementNameRdd; + @Column(name="PRI_ELEMENT_PROPERTY_ID") + @ApiParam(value ="主对象元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long priElementPropertyId; + + @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") + @ApiParam(value ="主对象元素属性名称") + @JsonSerialize(using = ToStringSerializer.class) + private String priElementPropertyNameRdd; + // 枚举:BlockFormEnumUtil.TRIGGER_EVENT @Column(name="PRI_ELEMENT_EVENT") @ApiParam(value ="主对象元素事件") @@ -78,7 +88,16 @@ public class BfMethodDetailProperty extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long secElementId; - @Column(name="sec_element_name_rdd") + @Column(name="SEC_ELEMENT_NAME_RDD") @ApiParam(value ="关联对象元素名称") private String secElementNameRdd; + + @Column(name="SEC_ELEMENT_PROPERTY_ID") + @ApiParam(value ="关联对象元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long secElementPropertyId; + + @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") + @ApiParam(value ="关联对象元素属性名称") + private String secElementPropertyNameRdd; } From cb1b5f9fdb65019f3578333ea30494fe01b1025b Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 8 Apr 2019 18:18:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 025dfe9..5fe7b1e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -40,11 +40,13 @@ public class DdlPackBean { public DdlPackBean(){ this.isHql = true; whereAppend = new StringBuilder(); + hqlPreparedMap = new HashMap<>(); } public DdlPackBean(boolean isHql){ this.isHql = isHql; whereAppend = new StringBuilder(); + hqlPreparedMap = new HashMap<>(); } public boolean isHql() {