43316 修复bomVersion启用问题

dev-temp-xw-202501031219-44700
臧学普 4 months ago
parent 62d27d7b53
commit be6816c3dd

@ -2307,13 +2307,13 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
MesException.throwMesBusiException("物料【%s】对应bom信息不存在", partNo); MesException.throwMesBusiException("物料【%s】对应bom信息不存在", partNo);
} }
MesBom mesBom = mesBoms.get(0); MesBom mesBom = mesBoms.get(0);
String effEndTime = mesBom.getEffEndTime(); String effStartTime = mesBom.getEffStartTime();
String bomCode = mesBom.getBomCode(); String bomCode = mesBom.getBomCode();
DdlPackBean ddlPackBean1 = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean ddlPackBean1 = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, ddlPackBean1); DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, ddlPackBean1);
DdlPreparedPack.getStringEqualPack(effEndTime, MesExtConstWords.EFF_START_TIME, ddlPackBean); DdlPreparedPack.getStringEqualPack(effStartTime, MesExtConstWords.EFF_START_TIME, ddlPackBean1);
DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", ddlPackBean); DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", ddlPackBean1);
//如果存在多个bomCode取最新的一个 //如果存在多个bomCode取最新的一个
return mesBomRDao.findByHqlWhere(ddlPackBean1); return mesBomRDao.findByHqlWhere(ddlPackBean1);
} }

@ -871,8 +871,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(mesBom.getBomCode(), "bomCode", bomPackBean); DdlPreparedPack.getStringEqualPack(mesBom.getBomCode(), "bomCode", bomPackBean);
DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, bomPackBean); DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, bomPackBean);
DdlPreparedPack.getStringSmallerPack(effectiveTime, MesExtConstWords.EFF_START_TIME, bomPackBean); DdlPreparedPack.getStringEqualPack(mesBom.getEffStartTime(), MesExtConstWords.EFF_START_TIME, bomPackBean);
if (isWithEffEndTime) DdlPreparedPack.getStringBiggerPack(effectiveTime, MesExtConstWords.EFF_END_TIME, bomPackBean);
List<MesBom> bomList = bomRao.findByHqlWhere(bomPackBean); List<MesBom> bomList = bomRao.findByHqlWhere(bomPackBean);
for (MesBom bom : bomList) { for (MesBom bom : bomList) {

Loading…
Cancel
Save