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 46a95e3..19cfb3a 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 @@ -146,6 +146,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 主表信息 单据类型 */ @@ -254,7 +255,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRANS_STATUS { - CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败"); + CREATE(1, "创建"), FINISH(2, "完成"), FAIL(3, "失败"); private int value; private String description; @@ -283,16 +284,17 @@ public class WmsEnumUtil { } } + /** * 消息队列，队列名称 * 1: success_queue * 2: fail_queue */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QUEUE_NAME{ + public enum QUEUE_NAME { - SUCCESS_QUEUE(1,"success_queue","成功消息队列"), - FAIL_QUEUE(2,"fail_queue","成功消息队列"); + SUCCESS_QUEUE(1, "success_queue", "成功消息队列"), + FAIL_QUEUE(2, "fail_queue", "成功消息队列"); private int value; private String name; @@ -352,7 +354,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCT_INSTOCK_STATUS { - CREATE(10, "创建"), FINISH(20, "已处理"),FAIL(30,"处理出错"); + CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"); private int value; private String description; @@ -380,4 +382,373 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCATE_TYPE { + COLLECT_LOCATE(10, "I", "收货库"), + BASICS_LOCATE(20, "P", "基础库"), + maneuver_LOCATE(30, "R", "机动库"), + COMBINATION_LOCATE(40, "D", "组合库"), + LINE_LOCATE(50, "L", "线边库"), + NC_LOCATE(60, "N", "NC库"); + + private int value; + private String code; + private String description; + + LOCATE_TYPE(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; + } + } + + /** + * 外部单据：移库单移动类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_MOVE_TYPE { + IN_STORE(1, "IN", "入库"), + OUT_STORE(2, "OUT", "出库"), + MOVE_STORE(3, "MOVE", "移库"); + + private int value; + private String code; + private String description; + + OUT_MOVEMENT_MOVE_TYPE(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; + } + } + + /** + * 外部单据：移库单业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_BUSI_TYPE { + RECEIVE_GOODS(1, "RC", "收货"), + QUALITY_TESTING(2, "QC", "质检"), + IN_STORE(3, "IN", "入库"), + MIX_RECEIVE(4, "ZI", "杂收"), + MIX_SEND(5, "ZO", "杂发"), + SUPPLIER_RETURN_GOODS(6, "VJ", "供应商退货"), + CUSTOMER_RETURN_GOODS(7, "CJ", "客户退货"), + ORDER_PICKING_PART(8, "WP", "工单领料"), + ORDER_RETURN_PART(9, "WJ", "工单退料"), + MOVE_IN(10, "MI", "移库入库"), + MOVE_OUT(11, "MO", "移库出库"), + SEND(12, "SO", "发运"); + + private int value; + private String code; + private String description; + + OUT_MOVEMENT_BUSI_TYPE(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; + } + } + + /** + * 外部单据：移库单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_STATUS { + CREATE(1, "新建"), + RECEIPT(10, "处理中"), + RECEIPT_FINISH(20, "已完成"), + CLOSED(90, "已关闭"), + CANCELLED(91, "已取消"); + + private int value; + private String description; + + OUT_MOVEMENT_STATUS(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; + } + + 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; + } + } + + /** + * 外部单据：移库单详情单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_DETAILS_UNIT { + CREATE(1, "AA"), + RECEIPT(2, "BB"), + RECEIPT_FINISH(3, "CC"), + CLOSED(4, "DD"), + CANCELLED(5, "EE"); + + private int value; + private String description; + + OUT_MOVEMENT_DETAILS_UNIT(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; + } + + 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; + } + } + + /** + * 外部单据：移库单详情状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_DETAILS_STATUS { + NORMAL(1, "N", "正常"), + CANCEL(2, "C", "取消"); + + private int value; + private String code; + private String description; + + OUT_MOVEMENT_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; + } + } + + /** + * 物料：分类（ABC） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_ABC { + A(1, "A", "正常"), + B(2, "B", "正常"), + C(3, "C", "取消"), + D(4, "D", "取消"), + E(5, "E", "取消"); + + private int value; + private String code; + private String description; + + PART_ABC(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; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 9e20f3b..d9e3bb6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -58,9 +58,9 @@ public class SysMenu extends BaseBean { } } - @Column(name="RED_PARENT_NAME") + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父级功能名称" , access ="父级功能名称") - private String redParentName; + private String parentNameRdd; @Column(name="MENU_CLASS_PATH") @ApiParam(value ="资源class path" , access ="资源class path") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 8809d79..2df17b4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -5,10 +5,12 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import javafx.scene.text.TextBoundsType; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; @@ -55,28 +57,28 @@ public class SysRole extends BaseBean { } } - @Column(name="RED_PARENT_NAME") + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="角色父节点名称" , access ="角色父节点名称") - private String redParentName; + private String parentNameRdd; - @Column(name="RED_MODULE_NAMES") - @ApiParam(value ="权限模块名称" , access ="权限模块名称") - private String redModuleNames; - - @Column(name="RED_MODULE_NUMBER") + @Column(name="MODULE_NUMBER") @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量") - private Integer redModuleNumber; + private Integer moduleNumber; - @Column(name="RED_MENU_NAMES") - @ApiParam(value ="权限功能名称" , access ="权限功能名称") - private String redMenuNames; + @Column(name="MODULE_NAMES_RDD") + @ApiParam(value ="权限模块名称" , access ="权限模块名称") + private String moduleNamesRdd; - @Column(name="RED_MENU_NUMBER") + @Column(name="MENU_NUMBER_RDD") @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量") - private Integer redMenuNumber; + private Integer menuNumber; + + @Column(name="MENU_NAMES_RDD",columnDefinition="TEXT") + @ApiParam(value ="权限功能名称" , access ="权限功能名称") + private String menuNamesRdd; - @Column(name="ROLE_STATUS_ID") + @Column(name="ROLE_STATUS") @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1") - private Integer roleStatusId; + private Integer roleStatus; } 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 94a70b7..8d4cc6e 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 @@ -142,7 +142,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getNumEqualPack(role.getRoleStatusId(),"roleStatusId",result); + HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); HqlPack.getStringLikerPack(role.getName(),"name",result); return result.toString(); 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 index 6680d2c..287fde2 100644 --- 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 @@ -51,7 +51,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "发出库仓库") private String srcWh; - @Column(name = "DEST_WH") @ApiParam(value = "接收库仓库") private String destWh; 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 2bba402..18f57bc 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 @@ -77,4 +77,7 @@ public class WmsShopping extends BaseBean { @ApiParam(value ="客户简称") private transient String custName; + + @ApiParam(value = "发往地简称") + private transient String flagName; } 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 57bbce5..d52d52f 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import org.apache.commons.lang3.StringUtils; @@ -24,13 +25,14 @@ public class WmsHqlPack { */ public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { + // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode()); - } else if (bean.getIsValid() > 0) { - hqlStr.append(" and model.isValid = " + bean.getIsValid()); + SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + // 封装有效状态和删除状态 + SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr.toString(); } @@ -51,9 +53,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result); - HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsDeleted(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrganizeCode(), "organizeCode", result); + + getStringBuilderPack(wmsPOMasterDetails, result); return result.toString(); } @@ -113,11 +114,9 @@ public class WmsHqlPack { 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); + HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); - return result.toString(); } @@ -545,8 +544,6 @@ public class WmsHqlPack { */ public static String packHqlWmsShipping(WmsShopping wmsShopping) { StringBuffer result = new StringBuffer(); - //有效性 - HqlPack.getNumEqualPack(wmsShopping.getIsValid(), "isValid", result); //发运单号 HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 @@ -555,10 +552,9 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result); //发运状态 HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); - //是否删除 - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - //工厂 - HqlPack.getStringEqualPack(wmsShopping.getOrganizeCode(),"organizeCode",result); + //特殊发货标志 + HqlPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); + getStringBuilderPack(wmsShopping, result); return result.toString(); } @@ -570,8 +566,6 @@ public class WmsHqlPack { */ public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { StringBuffer result = new StringBuffer(); - //有效性 - HqlPack.getNumEqualPack(wmsCheckFactRecord.getIsValid(), "isValid", result); //采购单号 HqlPack.getStringLikerPack(wmsCheckFactRecord.getPoNo(), "poNo", result); //ASN单号 @@ -582,10 +576,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); - //是否删除 - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - //工厂 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getOrganizeCode(),"organizeCode",result); + getStringBuilderPack(wmsCheckFactRecord, result); return result.toString(); }