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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
crish 6 years ago
parent 49dcd8b009 a13d87c246
commit bd015747a1
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File

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

@ -413,16 +413,16 @@ public class WmsHqlPack {
* @param wmsOpType
* @return
*/
public static String packHqlWmsOpType(WmsOpType wmsOpType) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsOpType(WmsOpType wmsOpType) {
DdlPackBean result = new DdlPackBean();
HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
DdlPreparedPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
getStringBuilderPack(wmsOpType, result);
return result.toString();
return result;
}
/**
@ -462,15 +462,15 @@ public class WmsHqlPack {
return result.toString();
}
public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
DdlPackBean result = new DdlPackBean();
HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
getStringBuilderPack(wmsOpType, result);
return result.toString();
return result;
}
/**
@ -1431,13 +1431,13 @@ public class WmsHqlPack {
*
* @return
*/
public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result);
public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result);
String data = String.join(",", roleIds);
HqlPack.getInPackString(data, "roleCode", result);
DdlPreparedPack.getInPack(data, "roleCode", result);
getStringBuilderPack(new WmsDataAuth(), result);
return result.toString();
return result;
}
/**
@ -1446,8 +1446,8 @@ public class WmsHqlPack {
* @param groupDataAuth
* @return
*/
public static String packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth) {
DdlPackBean result = new DdlPackBean();
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
//拼sql
entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())).forEach(o -> {
@ -1458,25 +1458,25 @@ public class WmsHqlPack {
List<Map> mapList = JSONObject.parseArray(data, Map.class);
if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", o.getKey())) {
for (Map whNoItem : mapList) {
HqlPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
DdlPreparedPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
}
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", o.getKey())) {
for (Map locateNoItem : mapList) {
HqlPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
DdlPreparedPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
}
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", o.getKey())) {
for (Map zoneNoItem : mapList) {
HqlPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
DdlPreparedPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
}
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", o.getKey())) {
for (Map zoneNoItem : mapList) {
HqlPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result);
DdlPreparedPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result);
}
}
}
});
getStringBuilderPack(new WmsDataAuth(), result);
return result.toString();
return result;
}
/**
@ -1486,14 +1486,17 @@ public class WmsHqlPack {
* @param vals
* @return
*/
public static String packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> vals) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> vals) {
DdlPackBean packBean = new DdlPackBean();
String data = String.join(",", vals);
HqlPack.getInPackString(data, columnName, result);
HqlPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", result);
HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result);
getStringBuilderPack(bean, result);
return result.toString();
DdlPreparedPack.getInPack(data, columnName, packBean);
DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);
getStringBuilderPack(bean, packBean);
DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean);
return packBean;
}
/**

Write Preview
Loading…
Cancel
Save