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
wei.peng 7 years ago
parent 19e107984e 8ab93eb53a
commit d1e12bd498
4 changed files with 47 additions and 132 deletions
Show Stats Download Patch File Download Diff File

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

@ -16,8 +16,11 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SOFT_TYPE {
IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"),
CENTER(99,"CENTER","注册服务中心");
IMPP(1, "impp-platform", "IMPP平台"),
CORE(2, "i3core", "i3业务平台"),
WMS(3, "i3wms", "仓库管理软件"),
MES(4, "i3mes", "生产管理软件"),
CENTER(99,"regist-center","注册服务中心");
public int value;
public String code;

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

@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
**/
public class WmsEnumUtil {
/**
* PO订单明细信息 是否免费
* 订单明细信息 是否免费
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IS_FREE {
@ -20,7 +20,7 @@ public class WmsEnumUtil {
private int value;
private String description;
private IS_FREE(int value, String description) {
IS_FREE(int value, String description) {
this.value = value;
this.description = description;
}
@ -45,18 +45,19 @@ public class WmsEnumUtil {
}
/**
* PO订单明细信息 状态
* 订单明细信息 状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_DETAILS_STATUS {
NORMAL(10, "N", "正常"),
ANCEL(20, "C", "行取消");
ANCEL(20, "C", "行取消"),
RECEIPTED(30, "R", "已收货");
private int value;
private String code;
private String description;
private ORDER_DETAILS_STATUS(int value, String code, String description) {
ORDER_DETAILS_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -96,10 +97,10 @@ public class WmsEnumUtil {
}
/**
* PO主表信息 单据来源
* 主表信息 单据来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PO_ORDER_SRC {
public enum ORDER_SRC {
MNU(1, "MNU", "手工"),
ERP(2, "ERP", "ERP接口");
@ -107,7 +108,7 @@ public class WmsEnumUtil {
private String code;
private String description;
private PO_ORDER_SRC(int value, String code, String description) {
ORDER_SRC(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -146,10 +147,10 @@ public class WmsEnumUtil {
}
}
/**
* PO主表信息 单据类型
* 主表信息 单据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PO_ORDER_TYPE {
public enum ORDER_TYPE {
REG(1, "REG", "原物料采购"),
SUB(10, "SUB", "委外采购"),
TAR(20, "TAR", "多角贸易采购"),
@ -159,7 +160,7 @@ public class WmsEnumUtil {
private String code;
private String description;
private PO_ORDER_TYPE(int value, String code, String description) {
ORDER_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -199,11 +200,11 @@ public class WmsEnumUtil {
}
/**
* PO主表信息 状态
* 主表信息 状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_STATUS {
CREATE(0, "新建"),
CREATE(1, "新建"),
RECEIPT(10, "收货中"),
RECEIPT_FINISH(20, "收货完成"),
WAREHOUSING(30, "入库中"),
@ -214,7 +215,7 @@ public class WmsEnumUtil {
private int value;
private String description;
private ORDER_STATUS(int value, String description) {
ORDER_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -258,7 +259,7 @@ public class WmsEnumUtil {
private int value;
private String description;
private TRANS_STATUS(int value, String description) {
TRANS_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -297,9 +298,6 @@ public class WmsEnumUtil {
private String name;
private String description;
QUEUE_NAME() {
}
QUEUE_NAME(int value, String name, String description) {
this.value = value;
this.name = name;
@ -350,55 +348,17 @@ public class WmsEnumUtil {
}
/**
* 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", "已收货");
public enum PRODUCT_INSTOCK_STATUS {
CREATE(10, "创建"), FINISH(20, "已处理"),FAIL(30,"处理出错");
private int value;
private String code;
private String description;
private ASN_MASTER_ORDER_STATUS(int value, String code, String description) {
PRODUCT_INSTOCK_STATUS(int value, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -410,10 +370,6 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -423,49 +379,5 @@ 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;
}
}
/**
* 是否已删除
*/
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;
}
}
}

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

@ -41,7 +41,7 @@ public class WmsASNMaster extends BaseBean {
public String asnType;
/**
* 状态:0=新建,10=收货中,20=收货完成,
* 状态:1=新建,10=收货中,20=收货完成,
* 30=入库中,40=入库完成,90=已关闭,91=已取消
*/
@Column(name="ASN_STATUS")

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

@ -24,16 +24,14 @@ public class WmsHqlPack {
*/
public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) {
if (hqlStr != null && hqlStr.toString().trim().length() > 0) {
if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode());
} else if (bean.getIsValid() > 0) {
hqlStr.append(" and model.isValid = " + bean.getIsValid());
}
hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode());
} else if (bean.getIsValid() > 0) {
hqlStr.append(" and model.isValid = " + bean.getIsValid());
}
hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
return hqlStr.toString();
}
@ -192,6 +190,8 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true);
HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true);
HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result);
@ -231,7 +231,7 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result);
HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result);
HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result);
HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result);
HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
@ -487,10 +487,7 @@ public class WmsHqlPack {
//客户全称
HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result);
HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result);
HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
"isDeleted", result);
getStringBuilderPack(basCustomer, result);
return result.toString();
}
@ -503,15 +500,14 @@ public class WmsHqlPack {
public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) {
StringBuffer result = new StringBuffer();
//有效性,删除标记
HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
//供应商编号
HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
//供应商简称
HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result);
//供应商全称
HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result);
getStringBuilderPack(wmsShippingFlag, result);
return result.toString();
}
@ -526,7 +522,9 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "type", result);
HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "status", result);
if (wmsASNMaster.getAsnStatus() != null) {
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);
@ -535,6 +533,7 @@ public class WmsHqlPack {
HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result);
// getStringBuilderPack(wmsASNMaster,result);
return result.toString();
}
@ -655,8 +654,8 @@ public class WmsHqlPack {
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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
getStringBuilderPack(wmsFGInStock, result);
return result.toString();
}
@ -668,13 +667,14 @@ public class WmsHqlPack {
*/
public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
getStringBuilderPack(wmsTaskInfo, result);
return result.toString();
}
}

Write Preview
Loading…
Cancel
Save