From 2231000f9a7bbe3906c6949878765fe169378a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 5 May 2019 17:04:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?BUG#4050+=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9C=8D=E5=8A=A1=E5=88=92=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 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 13bf512..a3b4325 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 @@ -474,7 +474,7 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result); DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); @@ -578,7 +578,7 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); @@ -627,7 +627,7 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); //采购单号 DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result); @@ -646,7 +646,7 @@ public class WmsHqlPack { } public static DdlPackBean packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); @@ -828,6 +828,7 @@ public class WmsHqlPack { /** * 根据条件查询单据锁定封装类 + * * @return 单据锁定信息 */ public static DdlPackBean packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) { @@ -951,10 +952,10 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(),"transTypeCode",result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); @@ -1032,6 +1033,7 @@ public class WmsHqlPack { /** * 针对质检查询库存移动条码条件封装(特殊处理) + * * @param sn * @return */ @@ -1102,7 +1104,7 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); //查询参数封装 DdlPreparedPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", @@ -1520,7 +1522,7 @@ public class WmsHqlPack { * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , List orderList) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); @@ -1572,12 +1574,12 @@ public class WmsHqlPack { * @param wmsTaskCreateLog * @return */ - public static String packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result); - HqlPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result); + public static DdlPackBean packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result); getStringBuilderPack(wmsTaskCreateLog, result); - return result.toString(); + return result; } /** From 7ffa55fbe8796496bb8b1f84b0e13aa050821af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Sun, 5 May 2019 18:39:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 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 a3b4325..64c8aba 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 @@ -101,15 +101,15 @@ public class WmsHqlPack { * @param wmsDocMovementDetails * @return */ - public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); getStringBuilderPack(wmsDocMovementDetails, result); - return result.toString(); + return result; } /** @@ -1627,14 +1627,14 @@ public class WmsHqlPack { * @param wmsDocMovementSn * @return */ - public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); + public static DdlPackBean packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); getStringBuilderPack(wmsDocMovementSn, result); - return result.toString(); + return result; } /** @@ -1643,14 +1643,14 @@ public class WmsHqlPack { * @param details * @return */ - public static String packHqlWmsDocMovementDetails(WmsDocMovementDetails details) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(details.getPartNo(), "partNo", result); + public static DdlPackBean packHqlWmsDocMovementDetails(WmsDocMovementDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); getStringBuilderPack(details, result); - return result.toString(); + return result; } /** From c72c2fa891a8c6e8a4ff81efd30f98f536f3625d Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Sun, 5 May 2019 19:04:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=95=A3=E4=BB=B6=E7=9B=98=E7=82=B9?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 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 13bf512..c4e3dbb 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 @@ -1697,8 +1697,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "", - WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result); + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() , + WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); From 5daf6d960fe432c2419d235c17cd9e3a71be35ce Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 6 May 2019 09:32:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?hqpPack=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 23436d1..63e0908 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -145,14 +145,14 @@ public class MesHqlPack { } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesWorkOrder.getStartTimeStart(), - mesWorkOrder.getStartTimeEnd(), - "startTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getEndTimeStart(), - mesWorkOrder.getEndTimeEnd(), - "endTime", packBean, true); +// DdlPreparedPack.timeBuilder( +// mesWorkOrder.getStartTimeStart(), +// mesWorkOrder.getStartTimeEnd(), +// "startTime", packBean, true); +// DdlPreparedPack.timeBuilder( +// mesWorkOrder.getEndTimeStart(), +// mesWorkOrder.getEndTimeEnd(), +// "endTime", packBean, true); DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean); return packBean; From 7e8730ea9fecea10b0fe536d4a754ba48239b2f3 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 6 May 2019 09:49:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=20=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 7 ++++--- .../java/cn/estsh/i3plus/pojo/form/bean/BfButton.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java | 6 ++++++ .../cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java | 6 +++++- .../estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java | 17 +++++++++++++++++ 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 752316c..4a39acd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1053,9 +1053,10 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_RECEIVER_TYPE { - INTERNAL(1, "内部人员接收"), - EXTERNAL(2, "外部人员接收"), - URGENT(3, "紧急联系人接收"); + INTERNAL(1, "内部人员"), + EXTERNAL(2, "外部人员"), + URGENT(3, "紧急联系人"), + SUPPLIER(4, "供应商"); private int value; private String description; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index 2b9622f..8dc3a8f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -38,9 +38,9 @@ public class BfButton extends BaseBean { @ApiParam(value = "触发方式") private Integer triggerMode; - public Integer getTriggerMode() { + public int getTriggerModeVal() { if (triggerMode == null) { - return null; + return 0; } else { return triggerMode.intValue(); } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java index e88a130..7594492 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -46,4 +48,8 @@ public class BfMethod extends BaseBean { @Column(name="METHOD_DESCRIPTION") @ApiParam(value ="功能描述") private String methodDescription; + + @Transient + @ApiParam(value ="表单功能自定义按钮") + private List bfButtonList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java index e6176e0..dec8a80 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -57,5 +59,7 @@ public class BfMethodDetail extends BaseBean { @ApiParam(value ="表单元素名称") private String elementNameRdd; - + @Transient + @ApiParam(value ="表单功能自定义按钮") + private List bfButtonList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java index 69eac9f..14eefa8 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java @@ -44,6 +44,14 @@ public class BfRefButtonMethod extends BaseBean { @ApiParam(value ="按钮位置类型") private Integer buttonPositionType; + public int getButtonPositionTypeVal(){ + if(buttonId == null){ + return 0; + } else { + return buttonPositionType.intValue(); + } + } + @Column(name="BUTTON_POSITION_REF_ID") @ApiParam(value ="按钮位置关联id") @JsonSerialize(using = ToStringSerializer.class) 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 c8ce167..dfb3cd4 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 @@ -297,4 +297,21 @@ public final class FormHqlPack { return ddlPackBean; } + + /** + * 元素信息复杂查询 + * @param bfElement 查询条件 + * @return DdlPackBean + */ + public static DdlPackBean packHqlBfElement(BfElement bfElement){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElement.getDataObjectId(), "dataObjectId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElement.getElementType(), "elementType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElement.getIsDeleted(), "isDeleted", ddlPackBean); + + return ddlPackBean; + } }