From e93605135c22d05b5825c6b4b3be2b2dc496afbd Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 9 May 2019 16:17:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?sweb=20=E5=8F=91=E5=B8=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modelbean/SwebPOForPubListResultModelV2.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java new file mode 100644 index 0000000..ee15a2a --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Collections; +import java.util.List; + +/** + * @Description : 待发布订单列表输出模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-02 13:13 + * @Modify: + **/ +@Data +public class SwebPOForPubListResultModelV2 extends BaseBean { + + @ApiParam(value = "拆分请求时间数量列表", example = "1") + private List reqTimeList = Collections.EMPTY_LIST; + + @ApiParam(value = "列表", example = "1") + private List list = Collections.EMPTY_LIST; +} From 58bc54f3c6b50ce4ec164c419e4e15367770a0e1 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 9 May 2019 17:28:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?sweb=20=E8=AE=A2=E5=8D=95=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 1 - 1 file changed, 1 deletion(-) 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 2996182..93f65f4 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 @@ -121,7 +121,6 @@ public class SwebHqlPack { public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); From 10844622a765ab43dfe2ff69b3775cb8b1bc9944 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 10 May 2019 14:58:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=202.=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=A0=E4=B8=8A=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 181 ++++----------------- 1 file changed, 33 insertions(+), 148 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 f53fe7d..30e113f 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 @@ -25,13 +25,6 @@ import java.util.stream.Collectors; **/ public class WmsHqlPack { - public static String packInParams(String colnumName, String[] params) { - StringBuffer sb = new StringBuffer(); - HqlPack.getInPackString(String.join(",", params), colnumName, sb); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb); - return sb.toString(); - } - /** * 封装公用查询参数 * @@ -54,27 +47,6 @@ public class WmsHqlPack { } /** - * 封装公用查询参数 - * - * @param bean 实体对象 - * @param hqlStr 查询语句 - * @return 封装完成的查询语句 - */ - public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { - - // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); - } - - // 封装有效状态和删除状态 - HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); - - return hqlStr.toString(); - } - - /** * PO订单明细表 分页查询 * * @param wmsPOMasterDetails @@ -202,14 +174,14 @@ public class WmsHqlPack { * @param routingCode * @return */ - public static String packHqlWmsRoutingChildren(String routingCode) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(routingCode, "routingCode", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + DdlPreparedPack.getStringEqualPack(routingCode, "routingCode", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - return result.toString(); + return result; } @@ -219,14 +191,14 @@ public class WmsHqlPack { * @param wmsRoutingMaster * @return */ - public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); - HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); + public static DdlPackBean packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); getStringBuilderPack(wmsRoutingMaster, result); - return result.toString(); + return result; } /** @@ -235,18 +207,18 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static String packHqlWmsPart(WmsPart wmsPart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); - HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); - HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); - HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result); - return result.toString(); + return result; } /** @@ -293,26 +265,6 @@ public class WmsHqlPack { } /** - * 库存交易记录信息 分页查询 - * - * @param wmsTrans - * @return - */ - public static String packHqlWmsTrans(WmsTrans wmsTrans) { - StringBuffer result = new StringBuffer(); - - //查询参数封装 - HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); - HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); - HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); - - getStringBuilderPack(wmsTrans, result); - - return result.toString(); - } - - - /** * 供应商分页查询 * * @param basVendor @@ -467,25 +419,6 @@ public class WmsHqlPack { return result; } - /** - * 供应商唯一性校验查询条件【用于添加和修改】 - * - * @param basVendor - * @return - */ - public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) { - DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); - - getStringBuilderPack(basVendor, result); - - return result; - } - public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { DdlPackBean result = new DdlPackBean(); @@ -498,38 +431,6 @@ public class WmsHqlPack { } /** - * 查询满足处理周期的作业类型 查询条件封装 - * - * @param wmsOpType - * @return - */ - public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) { - StringBuffer result = new StringBuffer(); - - getStringBuilderPack(wmsOpType, result); - result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins"); - return result.toString(); - } - - /** - * 作业任务数据来源 查询条件封装 - * - * @param wmsTaskSrc - * @return - */ - public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) { - StringBuffer result = new StringBuffer(); - - //作业类型代码 - HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); - - getStringBuilderPack(wmsTaskSrc, result); - - return result.toString(); - } - - - /** * 客户信息 查询条件封装 * * @param basCustomer @@ -805,25 +706,25 @@ public class WmsHqlPack { * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ - public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { + DdlPackBean result = new DdlPackBean(); // 仓库代码 - HqlPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); // 来源单据号 - HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); // 供应商编码 - HqlPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); // 物料编码 - HqlPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); // 负责人 - HqlPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); // 是否预分配 - HqlPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); + DdlPreparedPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); getStringBuilderPack(wmsAreaOwner, result); - return result.toString(); + return result; } /** @@ -1373,22 +1274,6 @@ public class WmsHqlPack { } /** - * 按moveNo 取最后一笔插入的数据 - * - * @param wmsMoveSn - * @return - */ - public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); - getStringBuilderPack(wmsMoveSn, result); - HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); - - return result.toString(); - } - - /** * 根据条件查询库存条码信息 * * @param wmsStockSn @@ -1590,19 +1475,19 @@ public class WmsHqlPack { * @param wmsTransModule * @return */ - public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) { + DdlPackBean result = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { - HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); } if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { - HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); } if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { - HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); } getStringBuilderPack(wmsTransModule, result); - return result.toString(); + return result; } /** From 24af646ad8beca66118c8a16889603a16a5f32ab Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 10 May 2019 16:36:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 6 ++++ .../bean/AndonAlarmType.java | 38 ++++++++++++++++++++++ .../repository/IAndonAlarmTypeRepository.java | 16 +++++++++ .../sqlpack/AndonHqlPack.java | 11 +++++++ 4 files changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index c31090b..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -13,5 +13,11 @@ i3plus-pojo-andon jar + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java new file mode 100644 index 0000000..2fcbd73 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +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; + +/** + * @Description : 安灯类型 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ALARM_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="安灯类型",description = "安灯类型") +public class AndonAlarmType extends BaseBean { + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "ALARM_NAME") + @ApiParam(value = "安灯类型名称") + private String alarmName; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java new file mode 100644 index 0000000..31afb4f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯类型信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonAlarmTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java new file mode 100644 index 0000000..12b3098 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.andon.sqlpack; + +/** + * @Description : 安灯对象查询封装 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 10:45 + * @Modify: + **/ +public class AndonHqlPack { +}