Merge branch 'dev' into test

yun-zuoyi
Silliter 6 years ago
commit 5ffc366dd0

@ -25,13 +25,6 @@ import java.util.stream.Collectors;
**/ **/
public class WmsHqlPack { public class WmsHqlPack {
public static String packInParams(String colnumName, String[] params) {
StringBuffer sb = new StringBuffer();
HqlPack.getInPackString(String.join(",", params), colnumName, sb);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb);
return sb.toString();
}
/** /**
* *
* *
@ -54,27 +47,6 @@ public class WmsHqlPack {
} }
/** /**
*
*
* @param bean
* @param hqlStr
* @return
*/
public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) {
// 判断工厂代码是否为空
if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
}
// 封装有效状态和删除状态
HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
return hqlStr.toString();
}
/**
* PO * PO
* *
* @param wmsPOMasterDetails * @param wmsPOMasterDetails
@ -202,14 +174,14 @@ public class WmsHqlPack {
* @param routingCode * @param routingCode
* @return * @return
*/ */
public static String packHqlWmsRoutingChildren(String routingCode) { public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) {
StringBuffer result = new StringBuffer(); DdlPackBean result = new DdlPackBean();
HqlPack.getStringEqualPack(routingCode, "routingCode", result); DdlPreparedPack.getStringEqualPack(routingCode, "routingCode", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
"isDeleted", result); "isDeleted", result);
return result.toString(); return result;
} }
@ -219,14 +191,14 @@ public class WmsHqlPack {
* @param wmsRoutingMaster * @param wmsRoutingMaster
* @return * @return
*/ */
public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { public static DdlPackBean packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) {
StringBuffer result = new StringBuffer(); DdlPackBean result = new DdlPackBean();
HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
getStringBuilderPack(wmsRoutingMaster, result); getStringBuilderPack(wmsRoutingMaster, result);
return result.toString(); return result;
} }
/** /**
@ -235,18 +207,18 @@ public class WmsHqlPack {
* @param wmsPart * @param wmsPart
* @return * @return
*/ */
public static String packHqlWmsPart(WmsPart wmsPart) { public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) {
StringBuffer result = new StringBuffer(); DdlPackBean result = new DdlPackBean();
HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
getStringBuilderPack(wmsPart, result); getStringBuilderPack(wmsPart, result);
return result.toString(); return result;
} }
/** /**
@ -293,26 +265,6 @@ public class WmsHqlPack {
} }
/** /**
*
*
* @param wmsTrans
* @return
*/
public static String packHqlWmsTrans(WmsTrans wmsTrans) {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result);
HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result);
HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true);
getStringBuilderPack(wmsTrans, result);
return result.toString();
}
/**
* *
* *
* @param basVendor * @param basVendor
@ -467,25 +419,6 @@ public class WmsHqlPack {
return result; return result;
} }
/**
*
*
* @param basVendor
* @return
*/
public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result);
DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result);
DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result);
getStringBuilderPack(basVendor, result);
return result;
}
public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
@ -498,38 +431,6 @@ public class WmsHqlPack {
} }
/** /**
*
*
* @param wmsOpType
* @return
*/
public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) {
StringBuffer result = new StringBuffer();
getStringBuilderPack(wmsOpType, result);
result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins");
return result.toString();
}
/**
*
*
* @param wmsTaskSrc
* @return
*/
public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) {
StringBuffer result = new StringBuffer();
//作业类型代码
HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
getStringBuilderPack(wmsTaskSrc, result);
return result.toString();
}
/**
* *
* *
* @param basCustomer * @param basCustomer
@ -805,25 +706,25 @@ public class WmsHqlPack {
* @param wmsAreaOwner * @param wmsAreaOwner
* @return * @return
*/ */
public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { public static DdlPackBean packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) {
StringBuffer result = new StringBuffer(); DdlPackBean result = new DdlPackBean();
// 仓库代码 // 仓库代码
HqlPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result);
// 来源单据号 // 来源单据号
HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result);
// 供应商编码 // 供应商编码
HqlPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result);
// 物料编码 // 物料编码
HqlPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result);
// 负责人 // 负责人
HqlPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result);
// 是否预分配 // 是否预分配
HqlPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); DdlPreparedPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result);
getStringBuilderPack(wmsAreaOwner, result); getStringBuilderPack(wmsAreaOwner, result);
return result.toString(); return result;
} }
/** /**
@ -1373,22 +1274,6 @@ public class WmsHqlPack {
} }
/** /**
* moveNo
*
* @param wmsMoveSn
* @return
*/
public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
getStringBuilderPack(wmsMoveSn, result);
HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
return result.toString();
}
/**
* *
* *
* @param wmsStockSn * @param wmsStockSn
@ -1590,19 +1475,19 @@ public class WmsHqlPack {
* @param wmsTransModule * @param wmsTransModule
* @return * @return
*/ */
public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) { public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
StringBuffer result = new StringBuffer(); DdlPackBean result = new DdlPackBean();
if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
} }
if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
} }
if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
} }
getStringBuilderPack(wmsTransModule, result); getStringBuilderPack(wmsTransModule, result);
return result.toString(); return result;
} }
/** /**

Loading…
Cancel
Save