diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java index 3937b15..f4d02c4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java @@ -1,7 +1,11 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; /** * @Description : @@ -10,6 +14,9 @@ import io.swagger.annotations.ApiParam; * @CreateDate : 2018-09-04 15:58 * @Modify: **/ +@Getter +@Setter +@ToString public class BaseModelBean { @ApiParam("操作对象") @@ -18,37 +25,23 @@ public class BaseModelBean { @ApiParam("翻页") private Pager pager; - private String OrdersString; + @ApiParam("排序SQL") + private String ordersString; - public BaseModelBean(Obj obj, Pager pager) { - this.obj = obj; - this.pager = pager; - } + @ApiParam("整型参数") + private long paramLong; - public BaseModelBean() { - } + @ApiParam("浮点数字参数") + private double paramDouble; - public Obj getObj() { - return obj; - } + @ApiParam("字符串参数") + private String paramString; - public void setObj(Obj obj) { + public BaseModelBean(Obj obj, Pager pager) { this.obj = obj; - } - - public Pager getPager() { - return pager; - } - - public void setPager(Pager pager) { this.pager = pager; } - public String getOrdersString() { - return OrdersString; - } - - public void setOrdersString(String ordersString) { - OrdersString = ordersString; + public BaseModelBean() { } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index f829a0f..ad47fee 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Getter; import lombok.Setter; @@ -93,4 +94,19 @@ public class BaseResultBean { public int getTotalCount() { return totalCount; } + + + public static BaseResultBean buildBaseResultBean(boolean success,String msg){ + BaseResultBean rs = new BaseResultBean(); + rs.success = success; + if(success) { + rs.msg = msg; + rs.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + }else { + rs.code = ResourceEnumUtil.MESSAGE.FAIL.getCode(); + rs.errorMsg = msg; + } + + return rs; + } } 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 f71827c..cf31941 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 @@ -348,7 +348,7 @@ public class ImppEnumUtil { * 2.UNREAD：未读 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USER_MESSAGE_STATUS{ + public enum MESSAGE_STATUS { READ(1,"已读","fa cell-fa fa-file-text"), UNREAD(2,"未读","fa cell-fa fa-file-o"); @@ -357,10 +357,10 @@ public class ImppEnumUtil { private String name; private String description; - USER_MESSAGE_STATUS() { + MESSAGE_STATUS() { } - USER_MESSAGE_STATUS(int value, String name, String description) { + MESSAGE_STATUS(int value, String name, String description) { this.value = value; this.name = name; this.description = description; @@ -415,7 +415,7 @@ public class ImppEnumUtil { * 2.STATION_LETTER：站内信 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USER_MESSAGE_TYPE{ + public enum MESSAGE_TYPE { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"); @@ -424,10 +424,10 @@ public class ImppEnumUtil { private String name; private String description; - USER_MESSAGE_TYPE() { + MESSAGE_TYPE() { } - USER_MESSAGE_TYPE(int value, String name, String description) { + MESSAGE_TYPE(int value, String name, String description) { this.value = value; this.name = name; this.description = description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index ddaef4e..7bc50c5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -31,19 +31,19 @@ public class SysConfig extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称") private String name; - + @Column(name="CONFIG_TYPE") @ApiParam(value ="配置类型ID（枚举：1.系统配置...）" , example ="-1") private Integer configType; - + @Column(name="CONFIG_CODE") @ApiParam(value ="配置代码") private String configCode; - + @Column(name="CONFIG_VALUE") @ApiParam(value ="配置值") private String configValue; - + @Column(name="CONFIG_DESCRIPTION") @ApiParam(value ="配置描述") private String configDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 00aa85b..e805f03 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -35,11 +35,11 @@ public class SysMessage extends BaseBean { private String messageTitle; @Column(name="MESSAGE_TYPE") - @ApiParam(value ="消息类型(枚举：1.通知，2.站内信)" , example ="-1") + @ApiParam(value ="消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") private Integer messageType; @Column(name="MESSAGE_CONTENT_TYPE") - @ApiParam(value ="消息内容类型(枚举：1.HTML，2.TEXT)" , example ="-1") + @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_CONTENT_TYPE)" , example ="-1") private Integer messageContentType; @Column(name="MESSAGE_CONTENT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java new file mode 100644 index 0000000..b8c52a4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.wms.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 : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_STEP") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤信息",description = "作业步骤信息") +public class WmsActionStep extends BaseBean { + + @Column(name = "AS_NAME_E") + @ApiParam(value = "英文类型名称") + private String asNameE; + + @Column(name = "AS_DESC_E") + @ApiParam(value = "英文类型描述") + private String asDescE; + + @Column(name = "AS_NAME_C") + @ApiParam(value = "中文类型名称") + private String asNameC; + + @Column(name = "AS_DESC_C") + @ApiParam(value = "中文类型描述") + private String asDescC; + + @Column(name = "AT_NAME_C_RDD") + @ApiParam(value = "步骤类型名称") + private String atNameCRdd; + + @Column(name = "AT_ID") + @ApiParam(value = "步骤类型编号") + private String atId; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java new file mode 100644 index 0000000..7b9f906 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng + * @CreateDate : 2018-11-22 14:18 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_STEP_CALL") +@Api("作业步骤调用信息") +public class WmsActionStepCall extends BaseBean { + + @Column(name="AS_ID") + @ApiParam("作业步骤ID") + public Long asId; + + @Column(name="SEQ") + @ApiParam(value = "序号",example = "0") + public Integer seq; + + @Column(name="AM_ID") + @ApiParam("处理组件ID") + public Long amId; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java new file mode 100644 index 0000000..cb08f18 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.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 : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤类型信息",description = "作业步骤类型信息") +public class WmsActionStepType extends BaseBean { + + @Column(name = "AT_NAME_E") + @ApiParam(value = "英文类型名称") + private String atNameE; + + @Column(name = "AT_DESC_E") + @ApiParam(value = "英文类型描述") + private String atDescE; + + @Column(name = "AT_NAME_C") + @ApiParam(value = "中文类型名称") + private String atNameC; + + @Column(name = "AT_DESC_C") + @ApiParam(value = "中文类型描述") + private String atDescC; + + @Column(name = "FUN_CALL_NAME") + @ApiParam(value = "方法调用名称") + private String funCallName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java new file mode 100644 index 0000000..1a6a5c0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; + +/** + * @Description : 作业步骤调用信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-22 14:41 + * @Modify: + **/ +public interface WmsActionStepCallRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java new file mode 100644 index 0000000..91e4ff9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java new file mode 100644 index 0000000..793ad96 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepType; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤类型操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepTypeRepository extends BaseRepository { +} 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 099c6e3..a29ad39 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 @@ -18,8 +18,7 @@ public class WmsHqlPack { /** * 封装公用查询参数 - * - * @param bean 实体对象 + * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ @@ -71,8 +70,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + getStringBuilderPack(wmsDocMovementDetails, result); + return result.toString(); } @@ -91,10 +90,8 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result); - HqlPack.getStringEqualPack(wmsDocMovementMaster.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + getStringBuilderPack(wmsDocMovementMaster, result); + return result.toString(); } @@ -116,6 +113,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); + return result.toString(); } @@ -127,10 +125,11 @@ public class WmsHqlPack { */ public static String packHqlWmsRoutingChildren(String routingCode) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(routingCode, "routingCode", result); + HqlPack.getStringEqualPack(routingCode, "routingCode", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result.toString(); } @@ -146,10 +145,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); - HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + getStringBuilderPack(wmsRoutingMaster, result); + return result.toString(); } @@ -167,10 +164,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); - HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + getStringBuilderPack(wmsPart, result); return result.toString(); } @@ -189,9 +183,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true); HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true); - HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(), "organizeCode", result); + + getStringBuilderPack(wmsIbCheckPlan, result); return result.toString(); } @@ -209,9 +202,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); - HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(), "organizeCode", result); + + getStringBuilderPack(wmsLocatePart, result); return result.toString(); } @@ -232,79 +224,13 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result); - HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(), "organizeCode", result); - - return result.toString(); - } - - /** - * 工厂仓库模糊分页查询 - * - * @param wareHouse - * @return - */ - public static String packHqlFactoryStore(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); - - // 部门名称 - HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); - // 部门代码 - HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - - return result.toString(); - } - - public static String packHqlWmsButton(WmsButton wmsButton) { - StringBuffer result = new StringBuffer(); - - // 功能名称（name） - HqlPack.getStringLikerPack(wmsButton.getName(), "name", result); - // 前端实现（ui） - HqlPack.getStringLikerPack(wmsButton.getUi(), "ui", result); - // URI权限规则（bs） - HqlPack.getStringLikerPack(wmsButton.getBs(), "bs", result); - - return result.toString(); - } - /** - * 元数据信息 分页查询 - * - * @param wmsObject - * @return - */ - public static String packHqlWmsObject(WmsObject wmsObject) { - StringBuffer result = new StringBuffer(); + getStringBuilderPack(wmsLocate, result); - // 编码 - HqlPack.getStringLikerPack(wmsObject.getCode(), "code", result); - // 名称 - HqlPack.getStringEqualPack(wmsObject.getName(), "name", result); - // 数据主表 - HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result); - // 自定义业务拦截 - HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result); return result.toString(); } /** - * 元数据字段分页查询 - * - * @param wmsField - * @return - */ - public static String packHqlWmsField(WmsField wmsField) { - StringBuffer result = new StringBuffer(); - // 编码 - HqlPack.getStringLikerPack(wmsField.getObjectCode(), "objectCode", result); - HqlPack.getStringLikerPack(wmsField.getTableName(), "tableName", result); - return result.toString(); - } - - - /** * 交易类型信息 分页查询 * * @param wmsTransType @@ -317,10 +243,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result); - HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(), "organizeCode", result); + + getStringBuilderPack(wmsTransType, result); return result.toString(); } @@ -338,8 +262,8 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); - HqlPack.getNumEqualPack(wmsTrans.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + + getStringBuilderPack(wmsTrans, result); return result.toString(); } @@ -352,12 +276,13 @@ public class WmsHqlPack { */ public static String packHqlWareHouse(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result); - HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + + getStringBuilderPack(wareHouse, result); + return result.toString(); } @@ -376,12 +301,10 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); - HqlPack.getStringEqualPack(basVendor.getOrganizeCode(), "organizeCode", result); - if (basVendor.getIsAsn() != null) { - HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); - } - HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); + + getStringBuilderPack(basVendor, result); + return result.toString(); } @@ -393,15 +316,14 @@ public class WmsHqlPack { */ public static String packHqlWmsOpType(WmsOpType wmsOpType) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); + + HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); - if (wmsOpType.getSeq() != null) { - HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result); - } - HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result); - HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result); - HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsOpType.getProCode(), "proCode", result); + HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result); + + getStringBuilderPack(wmsOpType, result); + return result.toString(); } @@ -413,10 +335,13 @@ public class WmsHqlPack { */ public static String packHqlWareHouseUnique(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + + getStringBuilderPack(wareHouse, result); + return result.toString(); } @@ -428,21 +353,25 @@ public class WmsHqlPack { */ public static String packHqlBasVendorUnique(BasVendor basVendor) { StringBuffer result = new StringBuffer(); - if (basVendor.getId() != null) { - HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result); - } + + HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result); HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + + getStringBuilderPack(basVendor, result); + return result.toString(); } public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + + getStringBuilderPack(wmsOpType, result); + return result.toString(); } @@ -455,16 +384,14 @@ public class WmsHqlPack { public static String packHqlWmsZones(WmsZones wmsZones) { StringBuffer result = new StringBuffer(); - //有效性 - HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result); //仓库代码 - HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); + HqlPack.getStringEqualPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); - //删除标记 - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsZones.getZoneNo(), "zoneNo", result); + + getStringBuilderPack(wmsZones, result); return result.toString(); } @@ -479,13 +406,14 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //客户编号 - HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result); + HqlPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); //客户简称 HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); getStringBuilderPack(basCustomer, result); + return result.toString(); } @@ -499,11 +427,12 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //供应商编号 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result); + HqlPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); //供应商全称 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); + getStringBuilderPack(wmsShippingFlag, result); return result.toString(); @@ -518,20 +447,16 @@ public class WmsHqlPack { public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "asnType", result); - if (wmsASNMaster.getAsnStatus() != null) { - HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result); - } - HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(), "vendorNo", result); - HqlPack.getStringLikerPack(wmsASNMaster.getVersion(), "version", result); + HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); + HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result); + HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); + HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); - HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(), "poNo", result); - //有效性 - HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); -// getStringBuilderPack(wmsASNMaster,result); + HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + + getStringBuilderPack(wmsASNMaster,result); + return result.toString(); } @@ -543,19 +468,22 @@ public class WmsHqlPack { */ public static String packHqlWmsShipping(WmsShopping wmsShopping) { StringBuffer result = new StringBuffer(); + //发运单号 - HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); //物料编码 HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); //条码 - HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsShopping.getSn(), "sn", result); //发运状态 HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); //特殊发货标志 HqlPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); + getStringBuilderPack(wmsShopping, result); + return result.toString(); } @@ -567,55 +495,47 @@ public class WmsHqlPack { */ public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { StringBuffer result = new StringBuffer(); + //采购单号 - HqlPack.getStringLikerPack(wmsCheckFactRecord.getPoNo(), "poNo", result); + HqlPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result); //ASN单号 - HqlPack.getStringLikerPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); + HqlPack.getStringEqualPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); //条码 - HqlPack.getStringLikerPack(wmsCheckFactRecord.getSn(), "getSn", result); + HqlPack.getStringEqualPack(wmsCheckFactRecord.getSn(), "getSn", result); //物料编码 HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); + getStringBuilderPack(wmsCheckFactRecord, result); - return result.toString(); - } - /** - * 明细表唯一性查询 - * - * @return - */ - public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails) { - StringBuffer result = new StringBuffer(); - //有效性 - HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getItem(), "item", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getNumLikerPack(wmsASNMasterDetails.getQty(), "qty", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getPoItem(), "poItem", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getUnit(), "unit", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getZDate(), "zDate", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getZTime(), "zTime", result); - HqlPack.getNumLikerPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getPackAge(), "packAge", result); - HqlPack.getNumLikerPack(wmsASNMasterDetails.getIsFree(), "isFree", result); + HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getZDate(), "zDate", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getZTime(), "zTime", result); + HqlPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result); + HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); + + getStringBuilderPack(wmsASNMasterDetails,result); - getStringBuilderPack(wmsASNMasterDetails, result); return result.toString(); } @@ -628,22 +548,23 @@ public class WmsHqlPack { public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(), "woNo", result); - HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsFGInStock.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsFGInStock.getWoNo(), "woNo", result); + HqlPack.getStringEqualPack(wmsFGInStock.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(), "qty", result); - HqlPack.getStringLikerPack(wmsFGInStock.getUnit(), "unit", result); - HqlPack.getStringLikerPack(wmsFGInStock.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result); + HqlPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result); HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", result); HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); - HqlPack.getStringLikerPack(wmsFGInStock.getErpWhNo(), "erpWhno", result); - HqlPack.getStringLikerPack(wmsFGInStock.getLineNo(), "lineNo", result); - HqlPack.getStringLikerPack(wmsFGInStock.getWhNo(), "whNo", result); - HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result); - HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); - HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); + HqlPack.getStringEqualPack(wmsFGInStock.getErpWhNo(), "erpWhno", result); + HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); + HqlPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result); + HqlPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); + HqlPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); + getStringBuilderPack(wmsFGInStock, result); return result.toString(); @@ -658,11 +579,12 @@ public class WmsHqlPack { public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); + HqlPack.getStringEqualPack(wmsTaskInfo.getMoveNo(), "moveNo", result); + HqlPack.getStringEqualPack(wmsTaskInfo.getUserNo(), "userNo", result); + HqlPack.getStringEqualPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result); HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); + getStringBuilderPack(wmsTaskInfo, result); return result.toString(); @@ -670,7 +592,6 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 - * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -693,15 +614,15 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 - * * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { + public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){ StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result); + getStringBuilderPack(wmsCSLocate, result); return result.toString(); @@ -709,16 +630,16 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 - * * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { + public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){ StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); + HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result); + HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result); + HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result); + getStringBuilderPack(wmsCSPart, result); return result.toString(); @@ -726,15 +647,15 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 - * * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { + public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){ StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result); + getStringBuilderPack(wmsCSZone, result); return result.toString(); @@ -742,7 +663,6 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 - * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -750,7 +670,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); // 仓库代码 - HqlPack.getStringLikerPack(wmsAreaOwner.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); // 来源单据号 HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); // 供应商编码 @@ -769,7 +689,6 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 - * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -777,7 +696,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); // 订单号 - HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); // 业务类型 HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); @@ -799,6 +718,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); getStringBuilderPack(wmsStockSn, result); + return result.toString(); } @@ -810,13 +730,15 @@ public class WmsHqlPack { */ public static String packWmsStockQuan(WmsStockQuan wmsStockQuan) { StringBuffer result = new StringBuffer(); + //查询参数封装 - HqlPack.getStringLikerPack(wmsStockQuan.getWhNo(), "whNo", result); - HqlPack.getStringLikerPack(wmsStockQuan.getZoneNo(), "zoneNo", result); - HqlPack.getStringLikerPack(wmsStockQuan.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsStockQuan.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); getStringBuilderPack(wmsStockQuan, result); + return result.toString(); } @@ -828,9 +750,11 @@ public class WmsHqlPack { */ public static String packWmsTransSn(Long tranNo) { StringBuffer result = new StringBuffer(); + //查询参数封装 HqlPack.getNumEqualPack(tranNo, "transNo", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result.toString(); } @@ -842,13 +766,15 @@ public class WmsHqlPack { */ public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) { StringBuffer result = new StringBuffer(); + //查询参数封装 - HqlPack.getStringLikerPack(wmsTransQuan.getWhNo(), "whNo", result); - HqlPack.getStringLikerPack(wmsTransQuan.getZoneNo(), "zoneNo", result); - HqlPack.getStringLikerPack(wmsTransQuan.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsTransQuan.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsTransQuan, result); + return result.toString(); } @@ -871,18 +797,17 @@ public class WmsHqlPack { return result.toString(); } - /** - * 内部单据：库存移动单主表唯一性查询 - * + *内部单据：库存移动单主表唯一性查询 * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { + public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); + HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); + getStringBuilderPack(wmsMoveMaster, result); return result.toString(); @@ -890,15 +815,15 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 - * * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { + public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); + HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + getStringBuilderPack(wmsMoveMaster, result); return result.toString(); @@ -906,26 +831,26 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 - * * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsMoveDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveDetails.getItem(), "item", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getCustNo(), "custNo", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getWhNo(), "whNo", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getZoneNo(), "zoneNo", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getLocateNo(), "locateNo", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getWhNo(),"whNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getZoneNo(),"zoneNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getLocateNo(),"locateNo",result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); + getStringBuilderPack(wmsMoveDetails, result); return result.toString(); @@ -933,17 +858,17 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 - * * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsMoveSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result); - HqlPack.getStringLikerPack(wmsMoveSn.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); + getStringBuilderPack(wmsMoveSn, result); return result.toString(); @@ -957,18 +882,20 @@ public class WmsHqlPack { */ public static String packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) { StringBuffer result = new StringBuffer(); + //单号 - HqlPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); //采购单号 - HqlPack.getStringLikerPack(wmsQCMaster.getPoNo(), "poNo", result); + HqlPack.getStringEqualPack(wmsQCMaster.getPoNo(), "poNo", result); //ASN单号 - HqlPack.getStringLikerPack(wmsQCMaster.getAsnNo(), "asnNo", result); + HqlPack.getStringEqualPack(wmsQCMaster.getAsnNo(), "asnNo", result); //入库单号 - HqlPack.getStringLikerPack(wmsQCMaster.getIbNo(), "ibNo", result); + HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result); getStringBuilderPack(wmsQCMaster, result); + return result.toString(); } @@ -980,9 +907,12 @@ public class WmsHqlPack { */ public static String packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) { StringBuffer result = new StringBuffer(); + //单号 HqlPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result); + getStringBuilderPack(wmsQCDetails, result); + return result.toString(); } @@ -994,11 +924,14 @@ public class WmsHqlPack { */ public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { StringBuffer result = new StringBuffer(); + //单号 HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); //行号 HqlPack.getStringEqualPack(wmsQCTrans.getItem(), "item", result); + getStringBuilderPack(wmsQCTrans, result); + return result.toString(); } @@ -1012,7 +945,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); @@ -1031,7 +964,8 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); + getStringBuilderPack(wmsCSOrderDetails, result); return result.toString(); @@ -1047,40 +981,61 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); + getStringBuilderPack(wmsCSFactTrans, result); return result.toString(); } /** - * 作业步骤处理组件查询条件封装 + * 作业步骤 查询 + * + * @param wmsActionStepCall + * @return + */ + public static String packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); + HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + + getStringBuilderPack(wmsActionStepCall, result); + + return result.toString(); + } + + /** + * 作业步骤类型表信息查询 * - * @param wmsActionModuleParam + * @param wmsActionStepType * @return */ - public static String packHqlWmsActionModule(WmsActionModuleParam wmsActionModuleParam) { + public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); - getStringBuilderPack(wmsActionModuleParam, result); + HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + + getStringBuilderPack(wmsActionStepType, result); return result.toString(); } /** - * 作业步骤处理组件参数查询条件封装 + * 作业步骤信息查询 * - * @param wmsActionModule + * @param wmsActionStep * @return */ - public static String packHqlWmsActionModuleParam(WmsActionModule wmsActionModule) { + public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); - getStringBuilderPack(wmsActionModule, result); + HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); + + getStringBuilderPack(wmsActionStep, result); return result.toString(); }