WMS实体对象重构,枚举修改

yun-zuoyi
Silliter 6 years ago
parent dedc7b45fe
commit 73181f1c1a

@ -49,9 +49,9 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_DETAILS_STATUS {
NORMAL(1, "N", "正常"),
ANCEL(10, "C", "行取消"),
RECEIPTED(20, "R", "已收货");
NORMAL(10, "N", "正常"),
RECEIPTED(20, "R", "已完成"),
ANCEL(30, "C", "行取消");
private int value;
private String code;
@ -101,8 +101,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_SRC {
MNU(1, "MNU", "手工"),
ERP(2, "ERP", "ERP接口");
MNU(10, "MNU", "手工"),
ERP(20, "ERP", "ERP接口");
private int value;
private String code;
@ -152,10 +152,10 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_TYPE {
REG(1, "REG", "原物料采购"),
SUB(10, "SUB", "委外采购"),
TAR(20, "TAR", "多角贸易采购"),
TAP(30, "TAP", "多角代采购");
REG(10, "REG", "原物料采购"),
SUB(20, "SUB", "委外采购"),
TAR(30, "TAR", "多角贸易采购"),
TAP(40, "TAP", "多角代采购");
private int value;
private String code;
@ -205,13 +205,13 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_STATUS {
CREATE(1, "新建"),
CREATE(10, "新建"),
RECEIPT(10, "收货中"),
RECEIPT_FINISH(20, "收货完成"),
WAREHOUSING(30, "入库中"),
WAREHOUSING_FINISH(40, "入库完成"),
CLOSED(90, "已关闭"),
CANCELLED(91, "已取消");
CLOSED(50, "已关闭"),
CANCELLED(60, "已取消");
private int value;
private String description;
@ -251,16 +251,18 @@ public class WmsEnumUtil {
}
/**
*
* PO
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRANS_STATUS {
CREATE(1, "创建"), FINISH(2, "完成"), FAIL(3, "失败");
public enum SN_DETAILS_STATUS {
CREATE(10, "新建"),
WAREHOUSING(30, "已打印"),
RECEIPT_FINISH(20, "已收货");
private int value;
private String description;
TRANS_STATUS(int value, String description) {
SN_DETAILS_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -282,8 +284,17 @@ public class WmsEnumUtil {
}
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;
}
}
/**
*
@ -294,7 +305,7 @@ public class WmsEnumUtil {
public enum QUEUE_NAME {
SUCCESS_QUEUE(1, "wms_success_queue", "成功消息队列"),
FAIL_QUEUE(2, "wms_fail_queue", "成功消息队列");
PENDING_QUEUE(2, "wms_pending_queue", "待处理消息队列");
private int value;
private String name;
@ -393,7 +404,8 @@ public class WmsEnumUtil {
MANEUVER_LOCATE(30, "R", "机动库"),
COMBINATION_LOCATE(40, "D", "组合库"),
LINE_LOCATE(50, "L", "线边库"),
NC_LOCATE(60, "N", "NC库");
NC_LOCATE(60, "N", "NC库"),
SPILLAGE_LOCATE(70, "Y", "溢料库");
private int value;
private String code;
@ -443,9 +455,9 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_MOVE_TYPE {
IN_STORE(1, "IN", "入库"),
OUT_STORE(10, "OUT", "出库"),
MOVE_STORE(20, "MOVE", "移库");
IN_STORE(10, "IN", "入库"),
OUT_STORE(20, "OUT", "出库"),
MOVE_STORE(30, "MOVE", "移库");
private int value;
private String code;
@ -495,18 +507,20 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_BUSI_TYPE {
RECEIVE_GOODS(1, "RC", "收货"),
QUALITY_TESTING(10, "QC", "质检"),
IN_STORE(20, "IN", "入库"),
MIX_RECEIVE(30, "ZI", "杂收"),
MIX_SEND(40, "ZO", "杂发"),
SUPPLIER_RETURN_GOODS(50, "VJ", "供应商退货"),
CUSTOMER_RETURN_GOODS(60, "CJ", "客户退货"),
ORDER_PICKING_PART(70, "WP", "工单领料"),
ORDER_RETURN_PART(80, "WJ", "工单退料"),
MOVE_IN(90, "MI", "移库入库"),
MOVE_OUT(100, "MO", "移库出库"),
SEND(110, "SO", "发运");
PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"),
CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"),
OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"),
ALLOCATION(40, "ALLOCATION", "调拨"),
SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
NC_WAREHOSING(70, "NC_WAREHOSING", "NC入库"),
SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),
CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回");
private int value;
private String code;
@ -556,11 +570,11 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_STATUS {
CREATE(1, "新建"),
RECEIPT(10, "处理中"),
RECEIPT_FINISH(20, "已完成"),
CLOSED(90, "已关闭"),
CANCELLED(91, "已取消");
CREATE(10, "新建"),
RECEIPT(20, "处理中"),
RECEIPT_FINISH(30, "已完成"),
CLOSED(40, "已关闭"),
CANCELLED(50, "已取消");
private int value;
private String description;
@ -600,105 +614,6 @@ public class WmsEnumUtil {
}
/**
*
*/
@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)
@ -862,20 +777,18 @@ public class WmsEnumUtil {
/**
*
* 1=10=20=30=40=50=60=70=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
CREATE(1, "创建"),
RECEIVED(10, "已收货"),
QUALITY_TESTED(20, "已质检"),
PUTIN_STORE(30, "已入库"),
WAIT_OUT_STORE(40, "待出库"),
IS_OUT_STORE(50, "已出库"),
ON_THE_WAY(60, "在途"),
QUARANTINED(70, "已隔离"),
BREAK_BUG(80, "破包"),
FROZEN(90, "冻结"),
CANCEL(100, "作废");
QUALITY_CONTROL(10, "质检中"),
PRE_INSTOCK(20, "待入库"),
INSTOCKED(30, "入库"),
PICKED(40, "配料"),
OUT_STOCK(50, "出库"),
SCRAPED(60, "报废"),
COMMING(70, "在途");
private int value;
private String description;
@ -919,10 +832,9 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_QC_STATUS {
CREATE(1, "未质检"),
RECEIVED(10, "质检合格"),
QUALITY_TESTED(20, "质检不合格"),
PUTIN_STORE(30, "已退货");
QUALIFIED(10, "合格"),
UNQUALIFIED(20, "不合格"),
QUAEANTINE(30, "隔离");
private int value;
private String description;
@ -1003,12 +915,12 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ORDER_STATUS {
CREATE(1, "创建"),
FROZEN(10, "已冻结"),
IN_INVENTORY(20, "盘点中"),
INVENTORY_FINISH(30, "盘点完成"),
THAWING(40, "已解冻"),
CLOSED(50, "已关闭");
CREATE(10, "创建"),
STARTING_INVENTORY(20, "开启盘点"),
IN_INVENTORY(30, "盘点中"),
INVENTORY_FINISH(40, "盘点完成"),
THAWING(50, "已解冻"),
CLOSED(60, "已关闭");
private int value;
private String description;
@ -1038,97 +950,15 @@ public class WmsEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_STATUS {
NO_QC(1, "未质检"),
IN_QC(10, "质检中"),
QUALIFIED_QC(20, "质检合格"),
DISQUALIFIED_QC(30, "质检不合格"),
RETURN_GOODS(40, "已退货");
private int value;
private String description;
QC_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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SN_STATUS {
CREATE(1, "创建"),
RECEIVE_GOODS(10, "已收货"),
QUALITY_TESTING(20, "已质检"),
IN_STORE(30, "已入库"),
WAIT_STORE(40, "待出库"),
OUT_STORE(50, "已出库"),
ON_PASSAGE(60, "在途"),
QUARANTINE(70, "已隔离"),
BALE_BROKEN(80, "破包"),
FROZEN(90, "冻结"),
RETURN_GOODS(100, "取消冻结");
private int value;
private String description;
SN_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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_TRANS_STATUS {
CREATE(1, "已创建"),
INVENTORY(5, "已盘"),
FROZEN(10, "已冻结"),
THAWING(20, "已解冻"),
RETURN_GOODS(30, "取消冻结");
CREATE(10, "已创建"),
INVENTORY(20, "已盘"),
FROZEN(30, "已冻结"),
THAWING(40, "已解冻"),
RETURN_GOODS(50, "取消冻结");
private int value;
private String description;
@ -1192,11 +1022,14 @@ public class WmsEnumUtil {
}
/**
* :1=,10=,20=
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MOVE_ORDER_STATUS {
CREATE(1, "创建"),BE_HANDLE(10, "待处理"),FINISH(20, "已处理");
CREATE(10, "创建"),
BE_HANDLE(20, "待处理"),
FINISH(30, "已处理"),
HANDLE_ERROR(40, "处理出错");
private int value;
private String description;
@ -1231,7 +1064,10 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_TYPE {
FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验"), SHIPMENTS(40, "出货检验");
FEED(1, "进料检验"),
ONLINE(10, "在线检验"),
EMDPRODUCT(30, "成品检验"),
SHIPMENTS(40, "出货检验");
private int value;
private String description;
@ -1265,11 +1101,11 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_STATUS {
CREATE(1, "创建"),
FINISH(5, "待处理"),
FAIL(10, "已完成"),
CLOSE(90, "已关闭"),
CANCEL(91, "已取消");
CREATE(10, "新建"),
FINISH(20, "待处理"),
FAIL(30, "已完成"),
CLOSE(40, "已关闭"),
CANCEL(50, "已取消");
private int value;
private String description;
@ -1369,40 +1205,6 @@ public class WmsEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRUE_OR_FALSE {
CHARGING(1, "是"), GRATIS(2, "否");
private int value;
private String description;
TRUE_OR_FALSE(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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1631,7 +1433,7 @@ public class WmsEnumUtil {
PROCESS_INITIALIZATION(20, "流程初始化组件"),
PROCESS_END(30, "流程结束组件"),
DETAIL_PROCESS(40, "明细处理组件"),
BACK_DISPLAY(50, "回显示组件");
BACK_DISPLAY(50, "回显方法");
private int value;
private String description;
@ -1661,44 +1463,6 @@ public class WmsEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ACTION_MODULE_TYPE {
HANDLE(10, "流程处理组件"),
INIT(20, "流程初始化组件"),
END(30, "流程结束组件"),
DETAILS(40, "明细处理组件"),
SHOW(50, "回显示组件");
private int value;
private String description;
ACTION_MODULE_TYPE(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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1870,8 +1634,6 @@ public class WmsEnumUtil {
}
}
/**
*
*/

@ -63,4 +63,12 @@ public class WmsASNMaster extends BaseBean {
@Column(name="PO_NO")
@ApiParam("PO单号")
public String poNo;
@Column(name = "CONTAINER_NO")
@ApiParam("集装箱号")
public String containerNo;
@Column(name="IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
}

@ -76,4 +76,8 @@ public class WmsAreaOwner extends BaseBean {
@Transient
@ApiParam(value = "库位名称")
private String locateName;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
}

@ -1,70 +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 : hansen.ke
* @CreateDate : 2018-11-02 9:33
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_BUTTON")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="元数据按钮信息表",description = "元数据按钮信息表")
public class WmsButton extends BaseBean {
@Column(name = "CODE")
@ApiParam(value = "元数据编码")
private String code;
@Column(name = "NAME")
@ApiParam(value = "按钮名称")
private String name;
@Column(name = "ICON")
@ApiParam(value = "图标")
private String icon;
@Column(name = "UI")
@ApiParam(value = "按钮UI路径")
private String ui;
@Column(name = "BS")
@ApiParam(value = "按钮BS路径")
private String bs;
@Column(name = "URL")
@ApiParam(value = "服务端URL")
private String url;
@Column(name = "ORDER_NUM")
@ApiParam(value = "排序号",example = "1")
private Integer orderNum;
@Column(name = "GROUP_NUM")
@ApiParam(value = "分组号",example = "1")
private Integer groupNum;
@Column(name = "IS_BASE")
@ApiParam(value = "是否基础功能",example = "2")
private Integer isBase;
@Column(name = "IS_HIDE")
@ApiParam(value = "是否删除",example = "2")
private Integer isHide;
}

@ -51,4 +51,8 @@ public class WmsCSOrderMaster extends BaseBean {
@Column(name="REMARK")
@ApiParam("备注")
public String reMark;
@Column(name="IS_INVENTORY")
@ApiParam(value = "是否允许清点", example = "1")
public Integer isInventory;
}

@ -39,4 +39,8 @@ public class WmsCSPart extends BaseBean {
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="IS_ADJUST")
@ApiParam(value = "调整标识", example = "1")
public Integer isAdjust;
}

@ -0,0 +1,59 @@
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_DATA_AUTH")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="数据权限信息",description = "数据权限信息")
public class WmsDataAuth extends BaseBean {
@Column(name = "ROLE_CODE")
@ApiParam(value = "角色编号")
private String roleCode;
@Column(name = "DATA_OBJ")
@ApiParam(value = "数据对象")
private String dataObj;
@Column(name = "DATA_OBJ_VALUE")
@ApiParam(value = "数据对象值")
private String dataObjValue;
@Column(name = "ADD_OP")
@ApiParam(value = "新增操作", example = "0")
private Integer addOp;
@Column(name = "DEL_OP")
@ApiParam(value = "删除操作", example = "0")
private Integer delOp;
@Column(name = "UPD_OP")
@ApiParam(value = "修改操作", example = "0")
private Integer updOp;
@Column(name = "QUERY_OP")
@ApiParam(value = "查询操作", example = "0")
private Integer queryOp;
}

@ -63,10 +63,6 @@ public class WmsDocMovementDetails extends BaseBean {
@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;
@ -97,22 +93,14 @@ public class WmsDocMovementDetails extends BaseBean {
private String remark;
@Column(name = "PICK_QTY")
@ApiParam(value = "已数量", example = "1")
@ApiParam(value = "已拣货数量", example = "1")
private Double pickQty;
@Column(name = "OUT_QTY")
@ApiParam(value = "已提交数量", example = "1")
@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;
@Column(name = "REC_QTY")
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
}

@ -99,4 +99,12 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "数量", example = "1")
private Double qty;
@Column(name="IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
@Column(name="PRIORITY")
@ApiParam(value = "优先级", example = "1")
public Integer priority;
}

@ -0,0 +1,67 @@
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 : hansen.ke
* @CreateDate : 2018-11-28 15:20
* @Modify:
* 2018-12-10 10:39:46 Test
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_MOVEMENT_SN")
@Api("PO条码信息")
public class WmsDocMovementSn 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;
/**
* :10 = 20 = 30 =
*/
@Column(name="SN_STATUS")
@ApiParam(value = "状态", example = "10")
public Integer snStatus;
@Column(name="SN_1D")
@ApiParam("一维条码")
public String snOneBarCode;
}

@ -1,127 +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 : amy
* @CreateDate : 2018-11-02 10:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_FIELD")
@Api("元数据字段表")
public class WmsField extends BaseBean{
@Column(name = "OBJECT_CODE")
@ApiParam("对象编码")
private String objectCode;
@Column(name = "FIELD_NUM")
@ApiParam(value = "表单分组序号",example = "-1")
private Integer fieldNum;
@Column(name = "ORDER_NUM")
@ApiParam(value = "排序索引",example = "-1")
private Integer orderNum;
@Column(name = "FIELD_SET")
@ApiParam("表单分组")
private String fieldSet;
@Column(name = "TABLE_NAME")
@ApiParam("字段表名")
private String tableName;
@Column(name = "FIELD_EN")
@ApiParam("英文名")
private String fieldEn;
@Column(name = "FIELD_CN")
@ApiParam("中文名")
private String fieldCn;
@Column(name = "TYPE")
@ApiParam("控件类型")
private String type;
@Column(name = "EXP")
@ApiParam("控件表达式")
private String exp;
@Column(name = "IS_QUERY")
@ApiParam(value = "是否可查询", example = "2")
private Integer isQuery;
@Column(name = "IS_SHOW")
@ApiParam(value = "是否可显", example = "1")
private Integer isShow;
@Column(name = "IS_DISABLE")
@ApiParam(value = "是否禁用", example = "2")
private Integer isDisable;
@Column(name = "IS_ORDER")
@ApiParam(value = "是否可排序", example = "1")
private Integer isOrder;
@Column(name = "IS_EDIT")
@ApiParam(value = "是否可编辑字段", example = "1")
private Integer isEdit;
@Column(name = "IS_REQURIED")
@ApiParam(value = "是否必填", example = "1")
private Integer isRequried;
@Column(name = "IS_MULTIPLE")
@ApiParam(value = "是否多选项", example = "2")
private Integer isMultiple;
@Column(name = "PLACEHOLDER")
@ApiParam("输入提示")
private String placeholder;
@Column(name = "VALIDATOR")
@ApiParam(value = "是否可编辑字段", example = "2")
private Integer validator;
@Column(name = "DEFAULTER")
@ApiParam("默认值")
private String defaulter;
@Column(name = "ADD_STATUS")
@ApiParam(value = "状态", example = "1")
private Integer addStatus;
@Column(name = "DATA_TYPE")
@ApiParam(value = "数据类型", example = "1")
private Integer dataType;
@Column(name = "DATA_TYPE_NAME")
@ApiParam("数据类型名称")
private String dataTypeName;
@Column(name = "DATA_SIZE")
@ApiParam(value = "整数位长度", example = "1")
private Integer dataSize;
@Column(name = "DATA_DECIMAL")
@ApiParam(value = "小数位长度", example = "1")
private Integer dataDecimal;
}

@ -67,9 +67,9 @@ public class WmsLocate extends BaseBean {
@ApiParam(value ="序号", example = "-1")
private Integer seq;
@Column(name="IS_EMPTY")
@ApiParam(value ="是否空库位", example = "-1")
private Integer isEmpty;
@Column(name="STATUS")
@ApiParam(value ="库位状态", example = "-1")
private Integer status;
@Column(name="MAX_PACKAGE_QTY")
@ApiParam(value ="最大包装数量", example = "-1")
@ -83,4 +83,15 @@ public class WmsLocate extends BaseBean {
@ApiParam(value ="存放单位")
private String stockUnit;
@Column(name="LINE_CODE")
@ApiParam(value ="生产线")
private String lineCode;
@Column(name="BOX_QTY")
@ApiParam(value ="箱数", example = "-1")
private Integer boxQty;
@Column(name="PART_QTY")
@ApiParam(value ="零件数", example = "-1")
private Integer partQty;
}

@ -1,93 +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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-02 10:37
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_OBJECT")
@Api("元数据信息表")
public class WmsObject extends BaseBean {
@Column(name = "CODE")
@ApiParam("对象编码")
private String code;
@Column(name = "NAME")
@ApiParam("对象名称")
private String name;
@Column(name = "VIEW_NAME")
@ApiParam("查询数据视图")
private String viewName;
@Column(name = "TABLE_NAME")
@ApiParam("保存数据主表")
private String tableName;
@Column(name = "PK_NAME")
@ApiParam("主键")
private String pkName;
@Column(name = "DATA_SOURCE")
@ApiParam("数据源")
private String dataSource;
@Column(name = "IS_SINGLE")
@ApiParam(value = "是否单选", example = "1")
private Integer isSingle;
@Column(name = "IS_CELL_EDIT")
@ApiParam(value = "是否可行内编辑", example = "2")
private Integer isCellEdit;
@Column(name = "IS_SHOW_NUM")
@ApiParam(value = "是否显示行号", example = "1")
private Integer isShowNum;
@Column(name = "IS_FIRST_LOAD")
@ApiParam(value = "是否初始加载", example = "1")
private Integer isFirstLoad;
@Column(name = "FILTER")
@ApiParam("初始数据过滤条件")
private String filter;
@Column(name = "DEFAULT_ORDER")
@ApiParam("默认排序字段(desc)")
private String defaultOrder;
@Column(name = "BIZ_INTERCEPT")
@ApiParam("自定义业务拦截")
private String bizIntercept;
@Transient
@ApiParam("元数据字段列表")
private List<WmsField> fiedList;
@Transient
@ApiParam("自定义按钮列表")
private List<WmsButton> btnList;
}

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
@ -40,8 +43,61 @@ public class WmsOpType extends BaseBean{
@ApiParam(value = "序号", example = "0")
private Integer seq;
@Column(name="PROG_CODE")
@ApiParam("处理程序")
private String proCode;
@Column(name="TM_ID")
@ApiParam(value = "交易处理组件ID", example = "0")
private Integer tmId;
@Column(name="DATA_SRC")
@ApiParam("数据来源")
private String dataSrc;
@Column(name="ORDER_MIN")
@ApiParam(value = "单据处理下限", example = "0")
private Integer orderMin;
@Column(name="ORDER_MAX")
@ApiParam(value = "单据处理上限", example = "0")
private Integer orderMax;
@Column(name="CYCLE_MINS")
@ApiParam(value = "处理周期(分钟)", example = "0")
private Integer cycleMins;
@Column(name="LAST_TRANS_TIME")
@ApiParam(value = "末次处理时间")
public String lastTransTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="末次处理时间",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String lastTransTimeStr;
@Column(name="IS_SPLIT")
@ApiParam(value = "是否拆分单据", example = "0")
private Integer isSplit;
@Column(name="SPLIT_RULE")
@ApiParam(value = "拆分规则")
public String splitRule;
@Column(name="IS_MERGE")
@ApiParam(value = "是否合并单据", example = "0")
private Integer isMerge;
@Column(name="MERGE_RULE")
@ApiParam(value = "合并规则")
public String mergeRule;
@Column(name="IS_AUTO_CLOSE")
@ApiParam(value = "任务未完是否关闭", example = "0")
private Integer isAutoClose;
@Column(name="USE_TIME")
@ApiParam(value = "标准工时(每箱)", example = "0")
private Integer userTime;
@Column(name="IS_MULITI")
@ApiParam(value = "是否允许多人操作", example = "0")
private Integer isMuliti;
}

@ -74,4 +74,8 @@ public class WmsPOMaster extends BaseBean {
@Transient
@ApiParam("供应商名称")
private String vendorName;
@Column(name="IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
}

@ -40,7 +40,7 @@ public class WmsPackage extends BaseBean {
@ApiParam("上级包装编号")
public String parentPackageNo;
@Column(name="SN")
@ApiParam("条码")
public String sn;
@Column(name="PACKAGE_QTY")
@ApiParam(value = "包装件数", example = "1")
public Integer packageQty;
}

@ -131,4 +131,8 @@ public class WmsStockSn extends BaseBean {
@Column(name = "REF_SRC")
@ApiParam(value = "关联单号")
private String refSrc;
@Column(name = "CUST_SN")
@ApiParam(value = "客户条码")
private String custSn;
}

@ -0,0 +1,112 @@
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_TASK_DETAILS")
@Api("作业任务明细信息")
public class WmsTaskDetails 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 = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "1")
private Double qty;
@Column(name = "TRANS_QTY")
@ApiParam(value = "处理数量", example = "1")
private Double transQty;
@Column(name = "ZDATE")
@ApiParam(value = "计划日期")
private String zdate;
@Column(name = "ZTIME")
@ApiParam(value = "计划时间")
private String ztime;
@Column(name = "SRC_WH_NO")
@ApiParam(value = "源仓库代码")
private String srcWhNo;
/**
* :N=,C=
*/
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
private Integer itemStatus;
@Column(name = "SRC_ZONE_NO")
@ApiParam(value = "源存储区代码")
private String srcZoneNo;
@Column(name = "SRC_LOCATE_NO")
@ApiParam(value = "源库位代码")
private String srcLocateNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam(value = "目的存储区代码")
private String destZoneNo;
@Column(name = "DEST_LOCATE_NO")
@ApiParam(value = "目的库位代码")
private String destLocateNo;
@Column(name = "DEST_WH_NO")
@ApiParam(value = "目的存储区代码")
private String destWhNo;
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型", example = "1")
private Integer refType;
@Column(name = "REF_SRC")
@ApiParam(value = "关联单据编号")
private String refSrc;
}

@ -54,4 +54,8 @@ public class WmsTaskInfo extends BaseBean {
@Column(name="TRANS_TYPE_CODE")
@ApiParam("交易类型")
private String transTypeCode;
@Column(name="PRE_USE_TIME")
@ApiParam(value = "预计作业时间(分钟)", example = "1")
public Integer preUseTime;
}

@ -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 : silliter.yuan
* @CreateDate : 2018-11-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TASK_SRC")
@Api("作业任务表")
public class WmsTaskSrc extends BaseBean {
@Column(name="OP_TYPE_CODE")
@ApiParam("作业类型编号")
public String opTypeCode;
@Column(name="ORDER_TYPE")
@ApiParam("业务类型")
public String orderType;
@Column(name="DATA_SRC")
@ApiParam("数据来源")
public String dataSrc;
}

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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 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;
import javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2018-11-01 11:57
* @Modify:
**/
@Data
@Entity
@Table(name = "WMS_TRANS_MODULE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "交易处理组件表", description = "交易处理组件表")
public class WmsTransModule extends BaseBean {
@Column(name = "TM_NAME")
@ApiParam(value = "组件名称")
private String tmName;
@Column(name = "TM_DESC")
@ApiParam(value = "组件描述")
private String tmDesc;
@Column(name = "CALL_CLASS")
@ApiParam(value = "实现类")
private String callClass;
@Column(name = "TM_TYPE")
@ApiParam(value = "组件类型", example = "-1")
private Integer tmType;
}

@ -81,4 +81,24 @@ public class WmsTransQuan extends BaseBean {
@Column(name = "REF_SRC")
@ApiParam(value = "关联单号")
public String refSrc;
@Column(name = "TRANS_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer transStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam(value = "错误信息")
public String errorMessage;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name="MOVE_NO")
@ApiParam("移动单号")
public String moveNo;
}

@ -71,4 +71,12 @@ public class WmsTransSn extends BaseBean {
@Column(name="TRANS_NO")
@ApiParam("事务编号")
public Long transNo;
@Column(name = "QC_STATUS")
@ApiParam(value = "质检状态", example = "0")
private Integer qcStatus;
@Column(name = "SN_STATUS")
@ApiParam(value = "条码状态", example = "0")
private Integer snStatus;
}

@ -1,14 +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.WmsButton;
/**
* @Description :()
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-02 10:22
* @Modify:
**/
public interface WmsButtonRepository extends BaseRepository<WmsButton,Long> {
}

@ -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.WmsField;
import org.springframework.stereotype.Service;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-02 11:24
* @Modify:
**/
@Service
public interface WmsFieldRepository extends BaseRepository<WmsField, Long> {
}

@ -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.WmsObject;
import org.springframework.stereotype.Service;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-02 11:23
* @Modify:
**/
@Service
public interface WmsObjectRepository extends BaseRepository<WmsObject, Long> {
}

@ -227,7 +227,7 @@ public class WmsHqlPack {
HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result);
HqlPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
getStringBuilderPack(wmsLocate, result);
@ -323,7 +323,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
HqlPack.getStringEqualPack(wmsOpType.getProCode(), "proCode", result);
HqlPack.getNumEqualPack(wmsOpType.getTmId(), "tmId", result);
HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
getStringBuilderPack(wmsOpType, result);
@ -799,7 +799,6 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
HqlPack.getStringEqualPack(wmsPackage.getSn(), "sn", result);
HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
getStringBuilderPack(wmsPackage, result);

Loading…
Cancel
Save