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
amy 7 years ago
parent 40b536aa8e 4ebe75e66c
commit 8ab93eb53a
2 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -346,4 +346,38 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 产品入库的产品状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCT_INSTOCK_STATUS {
CREATE(10, "创建"), FINISH(20, "已处理"),FAIL(30,"处理出错");
private int value;
private String description;
PRODUCT_INSTOCK_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;
}
}
}

37
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();
}
@ -658,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();
}
@ -671,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