|
@@ -612,8 +612,8 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
|
|
|
}else if("2".equals(bean.getTrayConf())){
|
|
|
// 来自上一工序
|
|
|
// 查找上一个工序的托盘夹具
|
|
|
- BomProcedure currBomProcedure = bomProcedureMapper.selectOne(Wraps.<BomProcedure>lbQ().eq(BomProcedure::getId,bean.getId()));
|
|
|
- BomProcedure preBomProcedure = bomProcedureMapper.selectOne(Wraps.<BomProcedure>lbQ().eq(BomProcedure::getBomId,bean.getBomId()).gt(BomProcedure::getSort,currBomProcedure.getSort()).orderByAsc(BomProcedure::getSort).last("limit 1"));
|
|
|
+ BomProcedureVersion currBomProcedure = baseMapper.selectOne(Wraps.<BomProcedureVersion>lbQ().eq(BomProcedureVersion::getId,bean.getId()));
|
|
|
+ BomProcedureVersion preBomProcedure = baseMapper.selectOne(Wraps.<BomProcedureVersion>lbQ().eq(BomProcedureVersion::getBomId,bean.getBomId()).gt(BomProcedureVersion::getSort,currBomProcedure.getSort()).orderByAsc(BomProcedureVersion::getSort).last("limit 1"));
|
|
|
|
|
|
BomProcedureTrayGroup preBomProcedureTrayGroup = bomProcedureTrayGroupService.getOne(Wraps.<BomProcedureTrayGroup>lbQ().eq(BomProcedureTrayGroup::getProcedureId,preBomProcedure.getId()));
|
|
|
BomProcedureTrayGroup currGroupBean = new BomProcedureTrayGroup();
|