I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

Browse Source
yun-zuoyi
jessica.chen 7 years ago
parent 5e9467cd35 10da7ff5bc
commit 3da0022d64
3 changed files with 322 additions and 10 deletions
Show Stats Download Patch File Download Diff File

326
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -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;
@ -284,17 +285,16 @@ 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;
@ -354,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;
@ -437,4 +437,318 @@ public class WmsEnumUtil {
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;
}
}
}

1
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
Unescape Escape View File

@ -51,7 +51,6 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "发出库仓库")
private String srcWh;
@Column(name = "DEST_WH")
@ApiParam(value = "接收库仓库")
private String destWh;

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -53,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();
}

Write Preview
Loading…
Cancel
Save