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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
许心洁 6 years ago
parent 60e6d51d35 c3fe273954
commit b2328bb085
1 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File

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

@ -49,10 +49,9 @@ public class WmsHqlPack {
/**
* 单位换算 分页查询
*
* @return
*/
public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) {
public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){
DdlPackBean result = new DdlPackBean();
//查询参数封装
@ -75,8 +74,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
@ -96,9 +95,9 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
@ -140,6 +139,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
getStringBuilderPack(wmsDocMovementMaster, packBean);
@ -182,7 +182,7 @@ public class WmsHqlPack {
DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(),
WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
@ -702,9 +702,9 @@ public class WmsHqlPack {
// 来源单据类型
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result);
// 来源单据号
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
DdlPreparedPack.getStringLikerPack(wmsSnPrint.getRefNo(), "refNo", result);
// 打印机
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
DdlPreparedPack.getStringLikerPack(wmsSnPrint.getPrinter(), "printer", result);
// 打印机状态
DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result);
@ -838,6 +838,7 @@ public class WmsHqlPack {
WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result);
}
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
result.setWhereAppend(result.getWhereAppend() + " and qty > 0");
getStringBuilderPack(wmsStockSn, result);
@ -893,7 +894,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
@ -964,8 +965,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
getStringBuilderPack(wmsPackage, result);
@ -1001,11 +1002,11 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
@ -1101,13 +1102,13 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//单号
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result);
//业务类型
DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
//关联单据类型
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
//关联单据号
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result);
getStringBuilderPack(wmsQCMaster, result);
@ -1727,10 +1728,10 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
DdlPackBean packBean = new DdlPackBean();
if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean);
DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmName(), "tmName", packBean);
}
if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean);
DdlPreparedPack.getStringLikerPack(wmsTransModule.getCallClass(), "callClass", packBean);
}
if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean);
@ -2177,6 +2178,45 @@ public class WmsHqlPack {
return result;
}
/**
* 库存条码管理查询条件
*
* @param wmsStockSn
* @return
*/
public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
// 物料编码支持多选
DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
// 存储区
DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
// 库位不为空
DdlPreparedPack.getStringNotNullPack( "locateNo", result);
DdlPreparedPack.getStringNoEqualPack("","locateNo", result);
// 排除创建及出库状态条码
if(wmsStockSn.getSnStatus() != null){
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
}
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result);
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result);
//数量大于0
DdlPreparedPack.getNumberBiggerPack(0,"qty",result);
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
getStringBuilderPack(wmsStockSn, result);
return result;
}
/******************************************作业记录日志HQLPACK开始************************************************/
/**
@ -2198,13 +2238,13 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean);
if ((actionLog.getStartTimeStart() != null && actionLog.getStartTimeStart() != "")
|| (actionLog.getStartTimeEnd() != null && actionLog.getStartTimeEnd() != "")) {
if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
|| (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true);
}
if ((actionLog.getEndTimeStart() != null && actionLog.getEndTimeStart() != "")
|| (actionLog.getEndTimeEnd() != null && actionLog.getEndTimeEnd() != "")) {
if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
|| (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true);
}
@ -2245,43 +2285,4 @@ public class WmsHqlPack {
/******************************************作业记录日志HQLPACK结束************************************************/
/**
* 库存条码管理查询条件
*
* @param wmsStockSn
* @return
*/
public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
// 物料编码支持多选
DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
// 存储区
DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
// 库位不为空
DdlPreparedPack.getStringNotNullPack("locateNo", result);
DdlPreparedPack.getStringNoEqualPack("", "locateNo", result);
// 排除创建及出库状态条码
if (wmsStockSn.getSnStatus() != null) {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
}
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result);
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
//数量大于0
DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
getStringBuilderPack(wmsStockSn, result);
return result;
}
}

Write Preview
Loading…
Cancel
Save