diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index eabf7ff..768dd80 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -151,6 +151,7 @@ public class CommonEnumUtil { /** * 处理标识 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_LOCALE_RESOURCE_TYPE { COMMON(1, "通用"),EXCEPTION(2, "异常"), MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"); @@ -300,6 +301,54 @@ public class CommonEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_INFO_STATUS { + INCUMBENT(1, "正常", "正常_NORMAL"), + RESIGNATION(2, "离职", "离职_RESIGNATION"); + + private int value; + private String code; + private String description; + + private USER_INFO_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * 数据状态 * 1 启用 @@ -503,4 +552,39 @@ public class CommonEnumUtil { } } + + /** + * 性别 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_ESX { + MALE(1, "男"), + FEMALE(2, "女"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private USER_ESX(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 feecd2a..db2f24e 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 @@ -10,16 +10,150 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @Modify: **/ public class WmsEnumUtil { + /** + * PO订单明细信息 是否免费 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_FREE { + CHARGING(0, "计费"), GRATIS(1, "免费"); + + private int value; + private String description; + + private IS_FREE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * PO订单明细信息 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_DETAILS_STATUS { + NORMAL(10, "N", "正常"), + ANCEL(20, "C", "行取消"); + + private int value; + private String code; + private String description; + + private ORDER_DETAILS_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * PO主表信息 单据来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_ORDER_SRC { + MNU(1, "MNU", "手工"), + ERP(2, "ERP", "ERP接口"); + + private int value; + private String code; + private String description; + + private PO_ORDER_SRC(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** * PO主表信息 单据类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PO_ORDER_TYPE { REG(1, "REG", "原物料采购"), - SUB(2, "SUB", "委外采购"), - TAR(3, "TAR", "多角贸易采购"), - TAP(4, "TAP", "多角代采购"); + SUB(10, "SUB", "委外采购"), + TAR(20, "TAR", "多角贸易采购"), + TAP(30, "TAP", "多角代采购"); private int value; private String code; @@ -68,7 +202,7 @@ public class WmsEnumUtil { * PO主表信息 状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PO_ORDER_STATUS { + public enum ORDER_STATUS { CREATE(0, "新建"), RECEIPT(10, "收货中"), RECEIPT_FINISH(20, "收货完成"), @@ -80,7 +214,7 @@ public class WmsEnumUtil { private int value; private String description; - private PO_ORDER_STATUS(int value, String description) { + private ORDER_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -117,6 +251,7 @@ public class WmsEnumUtil { /** * 交易状态 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRANS_STATUS { CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败"); @@ -213,4 +348,124 @@ public class WmsEnumUtil { return tmp; } } + + /** + * ASN单据类型 + */ + public enum ASN_ORDER_TYPE{ + + REG("REG","原物料采购"),SUB("SUB","委外采购"),TAR("TAR","多角贸易采购"),TAP("TAP","多角代采购"); + + private String value; + private String description; + + ASN_ORDER_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * ASN明细表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ASN_MASTER_ORDER_STATUS { + NORMAL(1, "N", "正常"), + CANCEL(2, "C", "行取消"), + RECEIPTED(3, "R", "已收货"); + + private int value; + private String code; + private String description; + + private ASN_MASTER_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 是否已删除 + */ + public enum IS_DELETED { + DELETED(1, "已删除"), INDELETED(2, "未删除"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + IS_DELETED(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 5d7b764..dbbc2af 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -881,7 +881,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) { if(propValues != null && propValues.length > 0){ String hql = "update " + persistentClass.getName() - + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + propName + " in(:"+propName+") "; Query query = entityManager.createQuery(hql); query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); @@ -903,7 +903,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("update " + persistentClass.getName() - + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 "); + + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 "); appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); query.setParameter("modifyUser",username); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java index bf4f1d6..73d4277 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java @@ -44,6 +44,10 @@ public class RefUserDepartment extends BaseBean { return userId; } } + + @Column(name="USER_NAME") + @ApiParam(value ="用户名称") + private String userNameRdd; @Column(name="DEPARTMENT_ID") @ApiParam(value ="部门ID" , example = "-1") @@ -58,16 +62,17 @@ public class RefUserDepartment extends BaseBean { } } - @Column(name="RED_DEPARTMENT_NAME") + @Column(name="DEPARTMENT_NAME_RDD") @ApiParam(value ="部门名称") - private String redDepartmentName; + private String departmentNameRdd; public RefUserDepartment() { } - public RefUserDepartment(Long userId, Long departmentId, String redDepartmentName) { + public RefUserDepartment(Long userId, String userName,Long departmentId, String departmentNameRdd) { this.userId = userId; + this.userNameRdd = userName; this.departmentId = departmentId; - this.redDepartmentName = redDepartmentName; + this.departmentNameRdd = departmentNameRdd; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java index d99a8e7..7b9eb74 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java @@ -44,6 +44,9 @@ public class RefUserPosition extends BaseBean { } } + @Column(name="USER_NAME_RDD") + @ApiParam(value ="用户名称") + private String userNameRdd; @Column(name="POSITION_ID") @ApiParam(value ="岗位ID" , example = "-1") @@ -58,16 +61,17 @@ public class RefUserPosition extends BaseBean { } } - @Column(name="RED_POSITION_NAME") + @Column(name="POSITION_NAME_RDD") @ApiParam(value ="岗位名称") - private String redPositionName; + private String positionNameRdd; public RefUserPosition() { } - public RefUserPosition(Long userId, Long positionId, String redPositionName) { + public RefUserPosition(Long userId,String userNameRdd, Long positionId, String positionNameRdd) { this.userId = userId; + this.userNameRdd = userNameRdd; this.positionId = positionId; - this.redPositionName = redPositionName; + this.positionNameRdd = positionNameRdd; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java index b643a56..1e2003b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java @@ -46,6 +46,11 @@ public class RefUserRole extends BaseBean { return userId; } } + + @Column(name="USER_NAME_RDD") + @ApiParam(value ="角色名称") + private String userNameRdd; + @Column(name="ROLE_ID") @ApiParam(value ="角色ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -59,16 +64,16 @@ public class RefUserRole extends BaseBean { } } - @Column(name="RED_ROLE_NAME") + @Column(name="ROLE_NAME_RDD") @ApiParam(value ="角色名称") - private String redRoleName; + private String roleNameRdd; public RefUserRole() { } - public RefUserRole(Long userId, Long roleId, String redRoleName) { + public RefUserRole(Long userId, Long roleId, String roleNameRdd) { this.userId = userId; this.roleId = roleId; - this.redRoleName = redRoleName; + this.roleNameRdd = roleNameRdd; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index fdf9dec..1c59a91 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.platform.bean; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -37,20 +38,7 @@ public class SessionUser implements Serializable { @ApiParam("用户对象信息") private SysUserInfo userInfo; - @ApiParam(value = "角色信息",access = "用户所拥有岗位信息集合") - private List roleList; - @ApiParam(value = "岗位信息",access = "用户所拥有岗位信息集合") - private List positionList; - - @ApiParam(value = "部门信息",access = "用户所有用部门信息集合") - private List departmentList; - - @ApiParam(value = "组织信息",access = "用户所拥有的组织信息集合") - private Organize organize; - - @ApiParam(value = "岗位信息",access = "用户主岗位信息") - private Position position; public SessionUser() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index c739e77..f5a576f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -33,13 +33,21 @@ public class SysLocaleResource extends BaseBean { private transient String resourceTypeTxt; public String getResourceTypeTxt(){ - return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType); + if(this.resourceType != null){ + return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType); + } else { + return null; + } } @Column(name="language_code") @ApiParam(value = "语言编码",example = "浏览器语言编码") private String languageCode; + @Column(name="language_name_rdd") + @ApiParam(value = "语言名称",example = "浏览器语言名称") + private String languageNameRdd; + @Column(name="resource_key") @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") private String resourceKey; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 59be473..58ba574 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -33,52 +34,33 @@ public class SysUser extends BaseBean { private static final long serialVersionUID = 1L; - @Column(name="NAME") - @ApiParam(value ="名称" , access ="名称") - private String name; + @Column(name="USER_INFO_ID") + @ApiParam(value ="用户ID" , example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private Long userInfoId; + + public Long getUserInfoId() { + if(userInfoId != null) { + return userInfoId.longValue(); + }else{ + return userInfoId; + } + } + + @Column(name="USER_NAME_RDD") + @ApiParam(value ="用户名称" , access ="用户名称") + private String userName; + @Column(name="USER_LOGIN_NAME") @ApiParam(value ="登陆名称" , access ="登陆名称") private String userLoginName; - @Column(name="USER_EMP_NO") - @ApiParam(value ="工号") - private String userEmpNo; - + @JsonIgnore @Column(name="USER_LOGIN_PASSWORD") @ApiParam(value ="登陆密码") private String userLoginPassword; - @Column(name="USER_TYPE_ID") - @ApiParam(value ="用户类型（枚举，待定）" , example ="-1") - private Integer userTypeId; - - @Column(name="DEPARTMENT_ID") - @ApiParam(value ="部门ID" , example ="-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long departmentId; - - public Long getDepartmentId() { - if(departmentId != null) { - return departmentId.longValue(); - }else{ - return departmentId; - } - } - - @Column(name="POSITION_ID") - @ApiParam(value ="岗位ID" , example ="-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long positionId; - - public Long getPositionId() { - if(positionId != null) { - return positionId.longValue(); - }else{ - return positionId; - } - } - @Column(name="ROLE_ID") @ApiParam(value ="角色ID" , example ="-1") @JsonSerialize(using = ToStringSerializer.class) @@ -92,38 +74,9 @@ public class SysUser extends BaseBean { } } - @Column(name="ORGANIZE_ID") - @ApiParam(value ="组织ID" , example = "0") - @JsonSerialize(using = ToStringSerializer.class) - private Long organizeId; - - public Long getOrganizeId() { - if(organizeId != null) { - return organizeId.longValue(); - }else{ - return organizeId; - } - } - - @Column(name="RED_ROLE_NAME") + @Column(name="ROLE_NAME_RDD") @ApiParam(value ="角色名称" , access ="角色名称") - private String redRoleName; - - @Column(name="RED_POSITION_NAME") - @ApiParam(value ="岗位名称" , access ="岗位名称") - private String redPositionName; - - @Column(name="RED_DEPARTMENT_NAME") - @ApiParam(value ="部门名称" , access ="部门名称") - private String redDepartmentName; - - @Column(name="RED_ORGANIZE_NAME") - @ApiParam(value ="组织名称" , access ="组织名称") - private String redOrganizeName; - - @Column(name="USER_ONLINE_ID") - @ApiParam(value ="是否在线(枚举：1.在线，2.离线)" , example ="-1") - private Integer userOnlineId; + private String roleNameRdd; @Column(name="USER_EMAIL") @ApiParam(value ="邮箱" , access ="邮箱") @@ -135,13 +88,34 @@ public class SysUser extends BaseBean { @Column(name="USER_STATUS_ID") @ApiParam(value ="用户状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") - private Integer userStatusId; + private Integer userStatus; @Column(name="USER_LOGIN_LAST_DATE_TIME") @ApiParam(value ="用户最后登录时间") private String userLoginLastDateTime; - @ApiParam(value ="用户详细信息") + @Column(name="DEPARTMENT_ID") + @ApiParam(value ="部门ID" , example ="-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long departmentId; + + public Long getDepartmentId() { + if(departmentId != null) { + return departmentId.longValue(); + }else{ + return departmentId; + } + } + + @Column(name="DEPARTMENT_NAME_RDD") + @ApiParam(value ="部门名称" , access ="部门名称") + private String departmentNameRdd; + + @Column(name="USER_TYPE_ID") + @ApiParam(value ="用户类型（枚举，待定）" , example ="-1") + private Integer userTypeId; + + @ApiParam(value ="用户信息") private transient SysUserInfo userInfo; @ApiParam(value ="用户所有角色信息") @@ -149,14 +123,4 @@ public class SysUser extends BaseBean { @ApiParam(value ="用户所有权限信息") private transient List menuList; - - @ApiParam(value ="用户所有部门信息") - private transient List departmentList; - - @ApiParam(value ="用户所有岗位信息") - private transient List positionList; - - @ApiParam(value ="用户组织信息") - private transient Organize organize; - } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 215ca70..3421f7f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -14,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.text.DecimalFormat; +import java.util.List; /** * @Description : 用户详细 @@ -34,40 +36,15 @@ public class SysUserInfo extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; - - @Column(name="USER_ID") - @ApiParam(value ="用户ID" , example = "0") - @JsonSerialize(using = ToStringSerializer.class) - private Long userId; - public Long getUserId() { - if(userId != null) { - return userId.longValue(); - }else{ - return userId; - } - } + @Column(name="USER_EMP_NO") + @ApiParam(value ="工号") + private String userEmpNo; @Column(name="LANGUAGE_CODE") @ApiParam(value ="用户语言") private String languageCode; - @Column(name="RED_DEPARTMENT_NAMES") - @ApiParam(value ="部门集合" , access ="部门集合") - private String redDepartmentNames; - - @Column(name="RED_POSITION_NAMES") - @ApiParam(value ="岗位集合" , access ="岗位集合") - private String redPositionNames; - - @Column(name="RED_ROLE_NAMES") - @ApiParam(value ="角色集合" , access ="角色集合") - private String redRoleNames; - - @Column(name="RED_ORGANIZE_NAMES") - @ApiParam(value ="组织集合" , access ="组织集合") - private String redOrganizeNames; - @Column(name="USER_IMAGE_ID") @ApiParam(value ="用户图像" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -88,7 +65,95 @@ public class SysUserInfo extends BaseBean { @Column(name="USER_AGE") @ApiParam(value ="年龄" , example ="1" , access ="年龄") private Integer userAge; - + @Column(name="DEPARTMENT_ID") + @ApiParam(value ="部门ID" , example ="-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long departmentId; + + public Long getDepartmentId() { + if(departmentId != null) { + return departmentId.longValue(); + }else{ + return departmentId; + } + } + + @Column(name="POSITION_ID") + @ApiParam(value ="岗位ID" , example ="-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long positionId; + + public Long getPositionId() { + if(positionId != null) { + return positionId.longValue(); + }else{ + return positionId; + } + } + + @Column(name="ORGANIZE_ID") + @ApiParam(value ="组织ID" , example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private Long organizeId; + + public Long getOrganizeId() { + if(organizeId != null) { + return organizeId.longValue(); + }else{ + return organizeId; + } + } + + @Column(name="DEPARTMENT_NAMES_RDD") + @ApiParam(value ="部门集合" , access ="部门集合") + private String departmentNamesRdd; + + @Column(name="POSITION_NAMES_RDD") + @ApiParam(value ="岗位集合" , access ="岗位集合") + private String positionNamesRdd; + + @Column(name="ORGANIZE_NAMES_RDD") + @ApiParam(value ="组织集合" , access ="组织集合") + private String organizeNamesRdd; + + @Column(name="POSITION_NAME_RDD") + @ApiParam(value ="岗位名称" , access ="岗位名称") + private String positionNameRdd; + + @Column(name="DEPARTMENT_NAME_RDD") + @ApiParam(value ="部门名称" , access ="部门名称") + private String departmentNameRdd; + + @Column(name="ORGANIZE_NAME_RDD") + @ApiParam(value ="组织名称" , access ="组织名称") + private String organizeNameRdd; + + @Column(name="USER_ONLINE_STATUS") + @ApiParam(value ="是否在线(枚举：1.在线，2.离线)" , example ="-1") + private Integer userOnlineStatus; + + @Column(name="USER_INFO_STATUS") + @ApiParam(value ="用户状态" , example ="-1") + private Integer userInfoStatus; + + @Column(name="USER_LOGIN_LAST_DATE_TIME") + @ApiParam(value ="用户最后登录时间") + private String userLoginLastDateTime; + + @ApiParam(value ="用户所有部门信息") + private transient List departmentList; + + @ApiParam(value ="用户所有岗位信息") + private transient List positionList; + + @ApiParam(value ="用户组织信息") + private transient Organize organize; + + @ApiParam(value = "岗位信息",access = "用户主岗位信息") + private transient Position position; + @JsonIgnore + @ApiParam(value ="用户详细信息") + private transient SysUser user; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index fe9c284..0c70f65 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -286,24 +286,21 @@ public class CoreHqlPack { } /** - * 用戶复杂查询 + * 账号复杂查询 * @param user * @return */ public static String packHqlSysUser(SysUser user){ StringBuffer result = new StringBuffer(); - // hql拼接 - HqlPack.getStringLikerPack(user.getName(),"name",result); + // And X = X + HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result); + HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); + // And Like % % + HqlPack.getStringLikerPack(user.getUserName(),"userName",result); HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - HqlPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result); HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); - HqlPack.getNumLikerPack(user.getUserStatusId(),"userStatusId",result); - HqlPack.getNumLikerPack(user.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(user.getPositionId(),"positionId",result); - HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result); - HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result); return result.toString(); } @@ -316,13 +313,35 @@ public class CoreHqlPack { public static String packHqlSysDictionaryCode(SysDictionary sysDictionary){ StringBuffer result = new StringBuffer(); + // and HqlPack.getStringEqualPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result); + // not HqlPack.getNumNOEqualPack(sysDictionary.getId(),"id",result); return result.toString(); } /** + * 用户信息 复杂查询拼接 + * @param userInfo + * @return + */ + public static String packHqlSysUserInfo(SysUserInfo userInfo){ + StringBuffer result = new StringBuffer(); + + // And + HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); + HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); + + // Like + HqlPack.getStringLikerPack(userInfo.getName(),"name",result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + + return result.toString(); + } + + /** * 查询语言代码是否重复 * @param sysLocaleLanguage * @return diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index f561ecf..d0f47fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -36,17 +36,17 @@ public class WmsASNMaster extends BaseBean { * 单据类型:REG=原物料采购, * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购 */ - @Column(name="TYPE") + @Column(name="ASN_TYPE") @ApiParam("单据类型") - public String type; + public String asnType; /** * 状态:0=新建,10=收货中,20=收货完成, * 30=入库中,40=入库完成,90=已关闭,91=已取消 */ - @Column(name="STATUS") + @Column(name="ASN_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer asnStatus; @Column(name="VENDOR_NO") @ApiParam("供应商编号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index de5cc1f..ccc7391 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -67,13 +67,13 @@ public class WmsASNMasterDetails extends BaseBean { /** * 状态:N=正常,C=行取消,R=已收货 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - public Integer status; + public Integer itemStatus; @Column(name="PACKAGE") @ApiParam("包装名称") - public String pageAge; + public String packAge; /** * 是否免费:0=计费,1=免费 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index 0890c54..cc86295 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -63,4 +63,7 @@ public class WmsCheckFactRecord extends BaseBean { @Column(name="CHECK_QTY") @ApiParam(value = "抽点数量", example = "0") public Double checkQty; + + @ApiParam(value ="供应商全称") + private transient String vendorDesc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java new file mode 100644 index 0000000..6680d2c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -0,0 +1,119 @@ +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 : dragon.xu + * @CreateDate : 2018-11-13 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_MOVEMENT_DETAILS") +@Api("移库单详情表") +public class WmsDocMovementDetails extends BaseBean { + @Column(name = "ORDER_NO") + @ApiParam(value = "单号") + private String orderNo; + + @Column(name = "ITEM") + @ApiParam(value = "行号", example = "1") + private Integer item; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "SRC_WH") + @ApiParam(value = "发出库仓库") + private String srcWh; + + + @Column(name = "DEST_WH") + @ApiParam(value = "接收库仓库") + private String destWh; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "1") + private Double qty; + + @Column(name = "PRINT_QTY") + @ApiParam(value = "条码打印数量", example = "1") + private Double printQty; + + @Column(name = "FACT_QTY") + @ApiParam(value = "操作完成数量", example = "1") + private Double factQty; + + @Column(name = "ZDATE") + @ApiParam(value = "计划日期") + private String zdate; + + @Column(name = "ZTIME") + @ApiParam(value = "计划时间") + private String ztime; + + @Column(name = "SRC_NO") + @ApiParam(value = "源单号") + private String srcNo; + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + private Integer itemStatus; + + /** + * 是否免费:0=计费,1=免费 + */ + @Column(name = "IS_FREE") + @ApiParam(value = "是否免费", example = "1") + public Integer isFree; + + @Column(name = "REMARK") + @ApiParam(value = "操作原因") + private String remark; + + @Column(name = "PICK_QTY") + @ApiParam(value = "已配数量", example = "1") + private Double pickQty; + + @Column(name = "OUT_QTY") + @ApiParam(value = "已提交数量", example = "1") + private Double outQty; + + @Column(name = "INLINE_QTY") + @ApiParam(value = "已上线数量", example = "1") + private Double inlineQty; + + @Column(name = "REJECT_QTY") + @ApiParam(value = "退料数量", example = "1") + private Double rejectQty; + + @Column(name = "REJECT_POST_QTY") + @ApiParam(value = "退料提交数量", example = "1") + private Double rejectPostQty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java new file mode 100644 index 0000000..1a3bc2a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -0,0 +1,102 @@ +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 : dragon.xu + * @CreateDate : 2018-11-13 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_MOVEMENT_MASTER") +@Api("移库单表") +public class WmsDocMovementMaster extends BaseBean { + @Column(name = "ORDER_NO") + @ApiParam(value = "移库单单号") + private String orderNo; + /** + * 移动类型:IN=入库,OUT=出库,MOVE=移库 + */ + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + public String moveType; + /** + * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, + * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, + * MI=移库入库,MO=移库出库,SO=发运 + */ + @Column(name = "BUSI_TYPE") + @ApiParam(value = "业务类型", example = "1") + public Integer busiType; + + /** + * 状态:0=新建,10=处理中 + * ,20=已完成,90=已关闭,91=已取消 + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; + + @Column(name = "CUSTOMER_NO") + @ApiParam(value = "客户编号") + private String customerNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VERSION") + @ApiParam(value = "版本", example = "1") + private Integer version; + + /** + * 单据类型::1=工单配料 + */ + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型") + private String refType; + + @Column(name = "REF_NO") + @ApiParam(value = "关联单据") + private String refNo; + + @Column(name = "ERP_SRC_NO") + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + /** + * 单据类型::1=工单配料 + */ + @Column(name = "ORDER_TYPE") + @ApiParam(value = "单据类型") + private String orderType; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "QTY") + @ApiParam(value = "数量", example = "1") + private Double qty; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 837a423..9be8adb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -57,16 +57,19 @@ public class WmsFGInStock extends BaseBean { public String sn; /** - * 状态:0=新建,10=已处理,20=处理出错 + * 状态：1=新建,10=已处理,20=处理出错 */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; @Column(name="REMARK") @ApiParam("备注") public String reMark; + /** + * 来源：MNU=手工,MES=MES接口 + */ @Column(name="SRC") @ApiParam("单据来源") public String src; @@ -91,7 +94,7 @@ public class WmsFGInStock extends BaseBean { @ApiParam("特殊发货标志") public String shippingFlag; - @Column(name="LOT_NO") + @Column(name="MFG_LOG_NO") @ApiParam("生产批次") - public String lotNo; + public String mfgLogNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java deleted file mode 100644 index a92ffd2..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java +++ /dev/null @@ -1,120 +0,0 @@ -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-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_MOVEMENT_DETAILS") -@Api("库存移动单明细信息") -public class WmsMoveMentDetails extends BaseBean { - - @Column(name="ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name="ITEM") - @ApiParam("行号") - public String item; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name="UNIT") - @ApiParam("单位") - public String unit; - - @Column(name="SRC_WH") - @ApiParam("发出库仓库") - public String srcWh; - - @Column(name="DEST_WH") - @ApiParam("接收库仓库") - public String destWh; - - @Column(name="PRINT_QTY") - @ApiParam("条码打印数量") - public String printQty; - - @Column(name="FACT_QTY") - @ApiParam("操作完成数量") - public String factQty; - - @Column(name="ZDATE") - @ApiParam("计划交货日期") - public String zDate; - - @Column(name="ZTIME") - @ApiParam("计划交货时间") - public String zTime; - - @Column(name="SRC_NO") - @ApiParam("源单号") - public String srcNo; - - /** - * 状态:N=正常,C=行取消 - */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "1") - public Integer status; - - @Column(name="REMARK") - @ApiParam("备注") - public String reMark; - - /** - * 是否免费:0=计费,1=免费 - */ - @Column(name="IS_FREE") - @ApiParam(value = "是否免费", example = "1") - public Integer isFree; - - @Column(name="PICK_QTY") - @ApiParam(value = "已配数量", example = "0") - public Double pickQty; - - @Column(name="OUT_QTY") - @ApiParam(value = "已提交数量", example = "0") - public Double outQty; - - @Column(name="INLINE_QTY") - @ApiParam(value = "已上线数量", example = "0") - public Double inLineQty; - - @Column(name="REJECT_QTY") - @ApiParam(value = "退料数量", example = "0") - public Double rejectQty; - - @Column(name="REJECT_POST_QTY") - @ApiParam(value = "退料提交数量", example = "0") - public Double rejectPostQty; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java deleted file mode 100644 index 92dc1ca..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java +++ /dev/null @@ -1,101 +0,0 @@ -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-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_MOVEMENT_MASTER") -@Api("库存移动单主表信息") -public class WmsMoveMentMaster extends BaseBean { - - @Column(name="ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 移动类型:IN=入库,OUT=出库,MOVE=移库 - */ - @Column(name="MOVE_TYPE") - @ApiParam("移动类型") - public String moveType; - - /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 - */ - @Column(name="TYPE") - @ApiParam("业务类型") - public String type; - - /** - * 状态:0=新建,10=处理中 - * ,20=已完成,90=已关闭,91=已取消 - */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; - - @Column(name="CUSTOMER_NO") - @ApiParam("客户编号") - public String customerNo; - - @Column(name="VENDOR_NO") - @ApiParam("供应商编号") - public String vendorNo; - - @Column(name="VERSION") - @ApiParam("版本") - public String version; - - @Column(name="SRC") - @ApiParam("单据来源") - public String src; - - @Column(name="SRC_NO") - @ApiParam("关联单据") - public String srcNo; - - @Column(name="ERP_ORDERNO") - @ApiParam("ERP单号") - public String erpOrderNo; - - /** - * 单据类型:WO=工单配料 - */ - @Column(name="ORDER_TYPE") - @ApiParam("单据类型") - public String orderType; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 36c2b14..f5a0b69 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -33,20 +33,20 @@ public class WmsPOMaster extends BaseBean { public String orderNo; /** - * 单据类型:1 REG=原物料采购, - * 2 SUB=委外采购,3 TAR=多角贸易采购,4 TAP=多角代采购 + * 单据类型: + * 1 REG=原物料采购,10 SUB=委外采购,20 TAR=多角贸易采购,30 TAP=多角代采购 */ - @Column(name="TYPE") + @Column(name="PO_TYPE") @ApiParam("单据类型") - public String type; + public String poType; /** - * 状态:0=新建,10=收货中,20=收货完成, + * 状态:1=新建,10=收货中,20=收货完成, * 30=入库中,40=入库完成,90=已关闭,91=已取消 */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="PO_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer poStatus; @Column(name="VENDOR_NO") @ApiParam("供应商编号") @@ -56,6 +56,9 @@ public class WmsPOMaster extends BaseBean { @ApiParam("版本") public String version; + /** + * 单据来源：1 MNU=手工,2 ERP=ERP接口 + */ @Column(name="SRC") @ApiParam("单据来源") public String src; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 7ebd1b1..97216a8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -49,20 +49,20 @@ public class WmsPOMasterDetails extends BaseBean { public Double qty; @Column(name="PRINT_QTY") - @ApiParam("条码打印数量") - public String printQty; + @ApiParam(value = "条码打印数量", example = "0") + public Double printQty; @Column(name="RC_QTY") - @ApiParam("收货数量") - public String rcQty; + @ApiParam(value = "收货数量", example = "0") + public Double rcQty; @Column(name="PASS_QTY") - @ApiParam("质检合格数量") - public String passQty; + @ApiParam(value = "质检合格数量", example = "0") + public Double passQty; @Column(name="NG_QTY") - @ApiParam("质检不合格数量") - public String ngQty; + @ApiParam(value = "质检不合格数量", example = "0") + public Double ngQty; @Column(name="UNIT") @ApiParam("单位") @@ -81,11 +81,11 @@ public class WmsPOMasterDetails extends BaseBean { public String whNo; /** - * 状态:N=正常,C=行取消 + * 状态:10 N=正常,20 C=行取消 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam("状态") - public String status; + public String itemStatus; @Column(name="SNP") @ApiParam("标准包装") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java index b68e949..2bba402 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java @@ -53,11 +53,11 @@ public class WmsShopping extends BaseBean { public String sn; /** - * 状态:0=新建,10=已处理,20=处理出错 + * 状态:10=新建,20=已处理,30=处理出错 */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "10") + public Integer orderStatus; @Column(name="REMARK") @ApiParam("备注") @@ -74,4 +74,7 @@ public class WmsShopping extends BaseBean { @Column(name="SHIPPING_FLAG") @ApiParam("特殊发货标志") public String shippingFlag; + + @ApiParam(value ="客户简称") + private transient String custName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 6b67dcf..764561c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -45,9 +45,9 @@ public class WmsTaskInfo extends BaseBean { public String reMark; /** - * 状态:0=创建,5=待处理,10=已处理 + * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="TASK_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer taskStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCheckFactRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCheckFactRecordRepository.java new file mode 100644 index 0000000..9970ffd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCheckFactRecordRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCheckFactRecord; +import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; + +/** + * @Description : 抽点记录表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-13 15:38 + * @Modify: + **/ +public interface WmsCheckFactRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java new file mode 100644 index 0000000..74e804a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.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.WmsDocMovementDetails; +import org.springframework.stereotype.Repository; + +/** +* @Description :库存移动单详情表的方法接口 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-13 10:19 +* @Modify: +**/ +@Repository +public interface WmsDocMovementDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java new file mode 100644 index 0000000..7dea50e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.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.WmsDocMovementMaster; +import org.springframework.stereotype.Repository; + +/** +* @Description :库存移动单主表的方法接口 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-13 10:19 +* @Modify: +**/ +@Repository +public interface WmsDocMovementMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java deleted file mode 100644 index ef0c9c5..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMentDetails; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 9:47 - * @Modify: - **/ -@Repository -public interface WmsMoveMentDetailsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java deleted file mode 100644 index 6ea8bc5..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMentMaster; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-06 9:47 - * @Modify: - **/ -@Repository -public interface WmsMoveMentMasterRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskInfoRepository.java new file mode 100644 index 0000000..cb32291 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskInfoRepository.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.WmsTaskInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(作业任务信息) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-13 15:53 + * @Modify: + **/ +@Repository +public interface WmsTaskInfoRepository 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 98aca6c..e151350 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -11,8 +12,61 @@ import cn.estsh.i3plus.pojo.wms.bean.*; * @Modify: **/ public class WmsHqlPack { + /** + * PO订单明细表 分页查询 + * + * @param wmsPOMasterDetails + * @return + */ + public static String packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getItem(), "item", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result); + + return result.toString(); + } /** + * 库存移动单详情查询封装 + * + * @param wmsDocMovementDetails + * @return + */ + public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrganizeCode(), "organizeCode", result); + + return result.toString(); + } + /** + * 库存移动单查询封装 + * + * @param wmsDocMovementMaster + * @return + */ + public static String packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsDocMovementMaster.getMoveType(), "moveType", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getPartNo(), "partNo", result); + HqlPack.timeBuilder(wmsDocMovementMaster.getCreateDateTimeStart(), wmsDocMovementMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); + + return result.toString(); + } + /** * PO订单主表信息 分页查询 * * @param wmsPOMaster @@ -23,11 +77,12 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsPOMaster.getType(), "type", result); - HqlPack.getNumEqualPack(wmsPOMaster.getStatus(), "status", result); + HqlPack.getStringLikerPack(wmsPOMaster.getPoType(), "poType", result); + HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result); HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result); return result.toString(); } @@ -209,7 +264,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result); // 自定义业务拦截 HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result); - return result.toString(); } @@ -241,7 +295,6 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); - return result.toString(); } @@ -258,7 +311,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); - return result.toString(); } @@ -275,6 +327,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result); HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -298,6 +351,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); } HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -317,6 +371,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result); HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result); HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -331,6 +386,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -348,6 +404,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -355,6 +412,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); return result.toString(); } @@ -424,14 +482,15 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",result); - HqlPack.getStringLikerPack(wmsASNMaster.getType(),"type",result); - HqlPack.getStringLikerPack(wmsASNMaster.getStatus().toString(),"status",result); + HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(),"type",result); + HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(),"status",result); HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(),"vendorNo",result); HqlPack.getStringLikerPack(wmsASNMaster.getVersion(),"version",result); HqlPack.getStringLikerPack(wmsASNMaster.getSrc(),"src",result); HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result); //有效性 HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -453,7 +512,114 @@ public class WmsHqlPack { //条码 HqlPack.getStringLikerPack(wmsShopping.getPartNo(), "partNo", result); //发运状态 - HqlPack.getStringEqualPack(wmsShopping.getStatus().toString(), "status", result); + HqlPack.getStringEqualPack(wmsShopping.getOrderStatus().toString(), "orderStatus", result); + return result.toString(); + } + + /** + * 产品发运信息 查询条件封装 + * + * @param wmsCheckFactRecord + * @return + */ + public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { + StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsCheckFactRecord.getIsValid(), "isValid", result); + //采购单号 + HqlPack.getStringLikerPack(wmsCheckFactRecord.getPoNo(), "poNo", result); + //ASN单号 + HqlPack.getStringLikerPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); + //条码 + HqlPack.getStringLikerPack(wmsCheckFactRecord.getSn(), "getSn", result); + //物料编码 + HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); + //供应商编号 + HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); + return result.toString(); + } + + /** + * 明细表唯一性查询 + * @return + */ + public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails){ + StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + return result.toString(); + } + + public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsASNMasterDetails.getItem(), "item", result); + HqlPack.getStringLikerPack(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.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.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + return result.toString(); + } + + /** + * 产品入库信息 条件封装 + * @param wmsFGInStock + * @return + */ + 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.getStringLikerPack(wmsFGInStock.getPartNameRdd(),"partNameRdd",result); + HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(),"qty",result); + HqlPack.getStringLikerPack(wmsFGInStock.getUnit(),"unit",result); + HqlPack.getStringLikerPack(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.getNumEqualPack(wmsFGInStock.getIsValid(),"isValid",result); + HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(),"isDeleted",result); + return result.toString(); + } + + /** + * 作业任务信息条件封装 + * @param wmsTaskInfo + * @return + */ + 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.getStringLikerPack(wmsTaskInfo.getReMark(),"reMark",result); + HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(),"taskStatus",result); + HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(),"isValid",result); + HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(),"isDeleted",result); return result.toString(); } }