|
|
|
@ -25,13 +25,6 @@ import java.util.stream.Collectors;
|
|
|
|
|
**/
|
|
|
|
|
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订单明细表 分页查询
|
|
|
|
|
*
|
|
|
|
|
* @param wmsPOMasterDetails
|
|
|
|
@ -202,14 +174,14 @@ public class WmsHqlPack {
|
|
|
|
|
* @param routingCode
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlWmsRoutingChildren(String routingCode) {
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
|
|
|
|
|
HqlPack.getStringEqualPack(routingCode, "routingCode", result);
|
|
|
|
|
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(routingCode, "routingCode", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
|
|
|
|
|
"isDeleted", result);
|
|
|
|
|
|
|
|
|
|
return result.toString();
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -219,14 +191,14 @@ public class WmsHqlPack {
|
|
|
|
|
* @param wmsRoutingMaster
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) {
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
|
|
|
|
|
HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
|
|
|
|
|
public static DdlPackBean packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
|
|
|
|
|
|
|
|
|
|
getStringBuilderPack(wmsRoutingMaster, result);
|
|
|
|
|
|
|
|
|
|
return result.toString();
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -235,18 +207,18 @@ public class WmsHqlPack {
|
|
|
|
|
* @param wmsPart
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlWmsPart(WmsPart wmsPart) {
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
|
|
|
|
|
HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
|
|
|
|
|
HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
|
|
|
|
|
HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
|
|
|
|
|
HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
|
|
|
|
|
HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", 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
|
|
|
|
@ -467,25 +419,6 @@ public class WmsHqlPack {
|
|
|
|
|
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) {
|
|
|
|
|
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
|
|
|
|
@ -805,25 +706,25 @@ public class WmsHqlPack {
|
|
|
|
|
* @param wmsAreaOwner 责任区分配信息
|
|
|
|
|
* @return 责任区分配信息
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) {
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
public static DdlPackBean packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) {
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
@ -1590,19 +1475,19 @@ public class WmsHqlPack {
|
|
|
|
|
* @param wmsTransModule
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) {
|
|
|
|
|
StringBuffer result = new StringBuffer();
|
|
|
|
|
public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
|
|
|
|
|
HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
|
|
|
|
|
}
|
|
|
|
|
if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
|
|
|
|
|
HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
|
|
|
|
|
}
|
|
|
|
|
if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
|
|
|
|
|
HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
|
|
|
|
|
}
|
|
|
|
|
getStringBuilderPack(wmsTransModule, result);
|
|
|
|
|
return result.toString();
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|