|
|
@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
|
|
|
|
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
|
|
|
|
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
import com.google.common.base.Strings;
|
|
|
|
import com.google.common.base.Strings;
|
|
|
|
|
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
@ -3174,11 +3175,23 @@ public class WmsHqlPack {
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
|
|
|
|
|
|
|
//查询参数封装
|
|
|
|
//查询参数封装
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsTestResultSummary.getBhCode(), "bhCode", result);
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkStatus(), "reworkStatus", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkStatus(), "reworkStatus", result);
|
|
|
|
|
|
|
|
if (wmsTestResultSummary.getIsQualified() != null) {
|
|
|
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getIsQualified(), "isQualified", result);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
List<String> qmsBH = wmsTestResultSummary.getBhCodeLts();
|
|
|
|
|
|
|
|
if (CollectionUtils.isEmpty(qmsBH)) {
|
|
|
|
|
|
|
|
qmsBH = new ArrayList<>();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!StringUtils.isNotBlank(wmsTestResultSummary.getBhCode())) {
|
|
|
|
|
|
|
|
qmsBH.add(wmsTestResultSummary.getBhCode());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(qmsBH)) {
|
|
|
|
|
|
|
|
DdlPreparedPack.getInPackList(qmsBH, "bhCode", result);
|
|
|
|
|
|
|
|
}
|
|
|
|
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
|
|
|
|
if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) {
|
|
|
|
if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) {
|
|
|
|
DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
|
|
|
|
DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
|
|
|
@ -3206,7 +3219,7 @@ public class WmsHqlPack {
|
|
|
|
//查询参数封装
|
|
|
|
//查询参数封装
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result);
|
|
|
|
//DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
|
|
|
|
if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {
|
|
|
|
if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {
|
|
|
@ -3235,7 +3248,7 @@ public class WmsHqlPack {
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result);
|
|
|
|
//DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result);
|
|
|
|
getStringBuilderPack(checkType, result);
|
|
|
|
getStringBuilderPack(checkType, result);
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -3316,4 +3329,36 @@ public class WmsHqlPack {
|
|
|
|
getStringBuilderPack(healthVariableResult, result);
|
|
|
|
getStringBuilderPack(healthVariableResult, result);
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 产品条码事务查询条件
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param wmsSerialSnTrans
|
|
|
|
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
public static DdlPackBean packHqlWmsSerialSnTrans(WmsSerialSnTrans wmsSerialSnTrans) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DdlPackBean packBean = new DdlPackBean();
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(wmsSerialSnTrans.getBatchNo(), "batchNo", packBean);
|
|
|
|
|
|
|
|
DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(), "transType", packBean);
|
|
|
|
|
|
|
|
getStringBuilderPack(wmsSerialSnTrans, packBean);
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* BH检测大类表查询条件
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param qmsStockSnExtBh
|
|
|
|
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
public static DdlPackBean packHqlQmsStockSnExtBh(QmsStockSnExtBh qmsStockSnExtBh) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DdlPackBean packBean = new DdlPackBean();
|
|
|
|
|
|
|
|
/* DdlPreparedPack.getStringEqualPack(qmsStockSnExtBh.getBatchNo(), "batchNo", packBean);
|
|
|
|
|
|
|
|
DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(),"transType",packBean);
|
|
|
|
|
|
|
|
getStringBuilderPack(wmsSerialSnTrans, packBean);*/
|
|
|
|
|
|
|
|
return packBean;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|